diff --git a/demos/movies/PagesCore/movies.html b/demos/movies/PagesCore/movies.html
index a446798..1f374d9 100644
--- a/demos/movies/PagesCore/movies.html
+++ b/demos/movies/PagesCore/movies.html
@@ -78,7 +78,7 @@ <h1>Netflix: Book a Movie...</h1>
 </script>
 
 <script id="bookingTitleTmpl" type="text/html">
-	<tr class="bookingTitle${$ctx.mode}">
+	<tr class="bookingTitle${$item.mode}">
 		<td>${movie.Name}</td><td>${movieTheater}</td>
 		<td>${formatDate(date)}</td>
 		<td>
@@ -104,7 +104,7 @@ <h1>Netflix: Book a Movie...</h1>
 
 <script type="text/javascript">
 	var genre="Cartoons", pageIndex=1, pageSize=3, pageCount=0,
-		cart = { bookings: {}, count: 0, sortBy:0 }, bookingCtxs = {}, selectedBooking;
+		cart = { bookings: {}, count: 0, sortBy:0 }, bookingItems = {}, selectedBooking;
 		
 	getMovies( pageIndex );
 
@@ -126,7 +126,7 @@ <h1>Netflix: Book a Movie...</h1>
 		.tmpl( cart )
 		.appendTo( ".cart", cart );
 
-	var cartCtx = $( ".cart td" ).tmpl();
+	var cartTmplItem = $( ".cart td" ).tmplItem();
 
 	function selectGenre() {
 		$( "#genres li" ).removeClass( "selected" );
@@ -155,7 +155,7 @@ <h1>Netflix: Book a Movie...</h1>
 		data = data.sort( compare );
 
 		for ( var i = 0, l = data.length; i < l; i++ ) {
-			$( bookingCtxs[data[i].movie.Id].nodes ).appendTo( "#bookingsList" );
+			$( bookingItems[data[i].movie.Id].nodes ).appendTo( "#bookingsList" );
 		}
 	
 		function compareName( a, b ) {
@@ -200,7 +200,7 @@ <h1>Netflix: Book a Movie...</h1>
 			.appendTo( "#movieList" )
 			.find( "div" ).fadeIn( 4000 ).end()
 			.find( ".buyButton" ).click( function() { 
-				buyTickets( $(this).tmpl().data ); 
+				buyTickets( $(this).tmplItem().data ); 
 			});
 		
 		$( "#movieList" ).fadeIn( "medium" )
@@ -213,7 +213,7 @@ <h1>Netflix: Book a Movie...</h1>
 			booking.quantity++;
 		} else {
 			cart.count++;
-			updateContext( cartCtx );
+			updateItem( cartTmplItem );
 			booking = { movie: movie, date: new Date(), quantity: 1, movieTheater: "" };
 		}
 		selectBooking( booking );
@@ -222,12 +222,12 @@ <h1>Netflix: Book a Movie...</h1>
 	function selectBooking( booking ) {
 		if ( selectedBooking ) {
 			if ( selectedBooking === booking ) {
-				updateBooking( bookingCtxs[selectedBooking.movie.Id]);
+				updateBooking( bookingItems[selectedBooking.movie.Id]);
 				return;
 			}
 			// Collapse previously selected booking, and switch to non-edit view
 			var oldSelected = selectedBooking; 
-			$( "div", bookingCtxs[oldSelected.movie.Id].nodes ).animate( { height: 0 }, 500, function() { 
+			$( "div", bookingItems[oldSelected.movie.Id].nodes ).animate( { height: 0 }, 500, function() { 
 				switchView( oldSelected );
 			});
 		}
@@ -245,14 +245,14 @@ <h1>Netflix: Book a Movie...</h1>
 				
 			// Attach handlers etc. on the rendered template.
 			// Pass the template context of the second tr, which the context for the "bookingEditTmpl" template
-			var newCtx = $.tmpl( bookingNode );
-			bookingCtxs[booking.movie.Id] = newCtx;
-			bookingEditRendered( newCtx ); 
+			var newItem = $.tmplItem( bookingNode );
+			bookingItems[booking.movie.Id] = newItem;
+			bookingEditRendered( newItem ); 
 		}
 	}
 
-	function bookingEditRendered( ctx ) {
-		var data = ctx.data, nodes = ctx.nodes;
+	function bookingEditRendered( item ) {
+		var data = item.data, nodes = item.nodes;
 		
 		$( nodes[0] ).click( function() { 
 			selectBooking();
@@ -262,89 +262,89 @@ <h1>Netflix: Book a Movie...</h1>
 		
 		$( ".date", nodes ).change( function() {
 			data.date = $(this).datepicker( "getDate" );
-			updateBooking( ctx );
+			updateBooking( item );
 		})
 		.datepicker({ dateFormat: "DD, d MM, yy" });
 
 		$( ".quantity", nodes ).change( function() {
 			data.quantity = $(this).val();
-			updateBooking( ctx );
+			updateBooking( item );
 		});
 
 		$( ".theater", nodes ).change( function() {
 			data.movieTheater = $(this).val();
-			updateBooking( ctx );
+			updateBooking( item );
 		});
 
-		if ( ctx.animate ) {
+		if ( item.animate ) {
 			$( "div", nodes ).css( "height", 0 ).animate( { height: 116 }, 500 );
 		}
 	}
 	
-	function bookingRendered( ctx ) {
-		$( ctx.nodes ).click( function() { 
-			selectBooking( ctx.data );
+	function bookingRendered( item ) {
+		$( item.nodes ).click( function() { 
+			selectBooking( item.data );
 		});
-		$( ".close", ctx.nodes ).click( removeBooking );
+		$( ".close", item.nodes ).click( removeBooking );
 	}
 
 	function switchView( booking, edit ) {
 		if ( !booking ) {
 			return;
 		}
-		var ctx = bookingCtxs[booking.movie.Id],
+		var item = bookingItems[booking.movie.Id],
 			tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates(); 
-		if ( ctx.tmpl !== tmpl) {
-			ctx.tmpl = tmpl; 
-			updateContext( ctx );
-			(edit ? bookingEditRendered : bookingRendered)( ctx );
+		if ( item.tmpl !== tmpl) {
+			item.tmpl = tmpl; 
+			updateItem( item );
+			(edit ? bookingEditRendered : bookingRendered)( item );
 		}
 	}
 
-	function updateBooking( ctx ) {
-		ctx.animate = false;
-		updateContext( ctx );
-		(ctx.data === selectedBooking ? bookingEditRendered : bookingRendered)( ctx );
-		ctx.animate = true;
+	function updateBooking( item ) {
+		item.animate = false;
+		updateItem( item );
+		(item.data === selectedBooking ? bookingEditRendered : bookingRendered)( item );
+		item.animate = true;
 	}
 
 	function removeBooking() {
-		var booking = $.tmpl(this).data;
+		var booking = $.tmplItem(this).data;
 		if ( booking === selectedBooking ) {
 			selectedBooking = null;
 		}
 		delete cart.bookings[booking.movie.Id];
 		cart.count--;
-		updateContext( cartCtx );
-		$( bookingCtxs[booking.movie.Id].nodes ).remove();
-		delete bookingCtxs[booking.movie.Id];
+		updateItem( cartTmplItem );
+		$( bookingItems[booking.movie.Id].nodes ).remove();
+		delete bookingItems[booking.movie.Id];
 		return false; 
 	}
 	
 	function removeBookings() {
-		for ( var ctx in bookingCtxs ) {
-			$( bookingCtxs[ctx].nodes ).remove();
-			delete bookingCtxs[ctx];
+		for ( var item in bookingItems ) {
+			$( bookingItems[item].nodes ).remove();
+			delete bookingItems[item];
 		}
-		bookingCtxs = {};
+		bookingItems = {};
 		cart.count = 0;
 		cart.bookings = {};
 		selectedBooking = null;
-		updateContext( cartCtx );
+		updateItem( cartTmplItem );
 	}
 	
 	function formatDate( date ) {
 		return date.toLocaleDateString();
 	}
 
-	function updateContext( ctx ) {
-		var coll = ctx.nodes;
-		$.tmpl( null, null, null, ctx ).insertBefore( coll[0] );
+	function updateItem( item ) {
+		var coll = item.nodes;
+		$.tmpl( null, null, null, item ).insertBefore( coll[0] );
 		$( coll ).remove();
 	}
 
-	function removeContext( ctx ) {
-		$( ctx.nodes ).remove();
+	function removeContext( item ) {
+		$( item.nodes ).remove();
 	}
 </script>
 
diff --git a/demos/movies/PagesTmplPlus/movies1.html b/demos/movies/PagesTmplPlus/movies1.html
index e89e75f..9f6be12 100644
--- a/demos/movies/PagesTmplPlus/movies1.html
+++ b/demos/movies/PagesTmplPlus/movies1.html
@@ -80,7 +80,7 @@ <h1>Netflix: Book a Movie...</h1>
 </script>
 
 <script id="bookingTitleTmpl" type="text/html">
-	<tr class="bookingTitle${$ctx.mode}">
+	<tr class="bookingTitle${$item.mode}">
 		<td>${movie.Name}</td><td>${movieTheater}</td>
 		<td>${formatDate(date)}</td>
 		<td>
@@ -106,7 +106,7 @@ <h1>Netflix: Book a Movie...</h1>
 
 <script type="text/javascript">
 	var genre="Cartoons", pageIndex=1, pageSize=3, pageCount=0,
-		cart = { bookings: {}, count: 0, sortBy:0 }, bookingCtxs = [], selectedBooking;
+		cart = { bookings: {}, count: 0, sortBy:0 }, bookingItems = [], selectedBooking;
 		
 	getMovies( pageIndex );
 
@@ -128,7 +128,7 @@ <h1>Netflix: Book a Movie...</h1>
 		.tmpl( cart )
 		.appendTo( ".cart", cart );
 
-	var cartCtx = $( ".cart td" ).tmpl();
+	var cartTmplItem = $( ".cart td" ).tmplItem();
 
 	function selectGenre() {
 		$( "#genres li" ).removeClass( "selected" );
@@ -156,7 +156,7 @@ <h1>Netflix: Book a Movie...</h1>
 		}
 		data = data.sort( compare );
 
-		bookingCtxs = $.tmplCmd( "replace", data, bookingCtxs );
+		bookingItems = $.tmplCmd( "replace", data, bookingItems );
 	
 		function compareName( a, b ) {
 			return a == b ? 0 : (((a.movie.Name > b.movie.Name) !== reverse) ? 1 : -1);
@@ -200,7 +200,7 @@ <h1>Netflix: Book a Movie...</h1>
 			.appendTo( "#movieList" )
 			.find( "div" ).fadeIn( 4000 ).end()
 			.find( ".buyButton" ).click( function() { 
-				buyTickets( $(this).tmpl().data ); 
+				buyTickets( $(this).tmplItem().data ); 
 			});
 		
 		$( "#movieList" ).fadeIn( "medium" )
@@ -213,7 +213,7 @@ <h1>Netflix: Book a Movie...</h1>
 			booking.quantity++;
 		} else {
 			cart.count++;
-			$.tmplCmd( "update", cartCtx );
+			$.tmplCmd( "update", cartTmplItem );
 			booking = { movie: movie, date: new Date(), quantity: 1, movieTheater: "" };
 		}
 		selectBooking( booking );
@@ -222,12 +222,12 @@ <h1>Netflix: Book a Movie...</h1>
 	function selectBooking( booking ) {
 		if ( selectedBooking ) {
 			if ( selectedBooking === booking ) {
-				updateBooking( bookingCtx( selectedBooking ));
+				updateBooking( bookingItem( selectedBooking ));
 				return;
 			}
 			// Collapse previously selected booking, and switch to non-edit view
 			var oldSelected = selectedBooking; 
-			$( "div", bookingCtx( oldSelected ).nodes ).animate( { height: 0 }, 500, function() { 
+			$( "div", bookingItem( oldSelected ).nodes ).animate( { height: 0 }, 500, function() { 
 				switchView( oldSelected );
 			});
 		}
@@ -245,14 +245,14 @@ <h1>Netflix: Book a Movie...</h1>
 				
 			// Attach handlers etc. on the rendered template.
 			// Pass the template context of the second tr, which the context for the "bookingEditTmpl" template
-			var newCtx = $.tmpl( bookingNode );
-			bookingCtxs.push( newCtx );
-			bookingEditRendered( newCtx ); 
+			var newItem = $.tmplItem( bookingNode );
+			bookingItems.push( newItem );
+			bookingEditRendered( newItem ); 
 		}
 	}
 
-	function bookingEditRendered( ctx ) {
-		var data = ctx.data, nodes = ctx.nodes;
+	function bookingEditRendered( item ) {
+		var data = item.data, nodes = item.nodes;
 		
 		$( nodes[0] ).click( function() { 
 			selectBooking();
@@ -262,79 +262,79 @@ <h1>Netflix: Book a Movie...</h1>
 		
 		$( ".date", nodes ).change( function() {
 			data.date = $(this).datepicker( "getDate" );
-			updateBooking( ctx );
+			updateBooking( item );
 		})
 		.datepicker({ dateFormat: "DD, d MM, yy" });
 
 		$( ".quantity", nodes ).change( function() {
 			data.quantity = $(this).val();
-			updateBooking( ctx );
+			updateBooking( item );
 		});
 
 		$( ".theater", nodes ).change( function() {
 			data.movieTheater = $(this).val();
-			updateBooking( ctx );
+			updateBooking( item );
 		});
 
-		if ( ctx.animate ) {
+		if ( item.animate ) {
 			$( "div", nodes ).css( "height", 0 ).animate( { height: 116 }, 500 );
 		}
 	}
 	
-	function bookingRendered( ctx ) {
-		$( ctx.nodes ).click( function() { 
-			selectBooking( ctx.data );
+	function bookingRendered( item ) {
+		$( item.nodes ).click( function() { 
+			selectBooking( item.data );
 		});
-		$( ".close", ctx.nodes ).click( removeBooking );
+		$( ".close", item.nodes ).click( removeBooking );
 	}
 
 	function switchView( booking, edit ) {
 		if ( !booking ) {
 			return;
 		}
-		var ctx = bookingCtx( booking ),
+		var item = bookingItem( booking ),
 			tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates(); 
-		if ( ctx.tmpl !== tmpl) {
-			ctx.tmpl = tmpl; 
-			$.tmplCmd( "update", ctx );
-			(edit ? bookingEditRendered : bookingRendered)( ctx );
+		if ( item.tmpl !== tmpl) {
+			item.tmpl = tmpl; 
+			$.tmplCmd( "update", item );
+			(edit ? bookingEditRendered : bookingRendered)( item );
 		}
 	}
 
-	function updateBooking( ctx ) {
-		ctx.animate = false;
-		$.tmplCmd( "update", ctx );
-		(ctx.data === selectedBooking ? bookingEditRendered : bookingRendered)( ctx );
-		ctx.animate = true;
+	function updateBooking( item ) {
+		item.animate = false;
+		$.tmplCmd( "update", item );
+		(item.data === selectedBooking ? bookingEditRendered : bookingRendered)( item );
+		item.animate = true;
 	}
 
 	function removeBooking() {
-		var booking = $.tmpl(this).data;
+		var booking = $.tmplItem(this).data;
 		if ( booking === selectedBooking ) {
 			selectedBooking = null;
 		}
 		delete cart.bookings[booking.movie.Id];
 		cart.count--;
-		$.tmplCmd( "update", cartCtx );
-		$.tmplCmd( "remove", booking, bookingCtxs );
+		$.tmplCmd( "update", cartTmplItem );
+		$.tmplCmd( "remove", booking, bookingItems );
 		return false; 
 	}
 	
 	function removeBookings() {
-		$.tmplCmd( "remove", bookingCtxs );
-		bookingCtxs = [];
+		$.tmplCmd( "remove", bookingItems );
+		bookingItems = [];
 		cart.count = 0;
 		cart.bookings = {};
 		selectedBooking = null;
-		$.tmplCmd( "update", cartCtx );
+		$.tmplCmd( "update", cartTmplItem );
 	}
 	
 	function formatDate( date ) {
 		return date.toLocaleDateString();
 	}
 
-	function bookingCtx( booking ) {
-		return $.tmplCmd( "find", booking, bookingCtxs)[0];
+	function bookingItem( booking ) {
+		return $.tmplCmd( "find", booking, bookingItems)[0];
 	}
 </script>
 
diff --git a/demos/movies/PagesTmplPlus/movies2.html b/demos/movies/PagesTmplPlus/movies2.html
index 6426fb3..6181f5e 100644
--- a/demos/movies/PagesTmplPlus/movies2.html
+++ b/demos/movies/PagesTmplPlus/movies2.html
@@ -79,7 +79,7 @@ <h1>Netflix: Book a Movie...</h1>
 </script>
 
 <script id="bookingTitleTmpl" type="text/html">
-	<tr class="bookingTitle${$ctx.mode}">
+	<tr class="bookingTitle${$item.mode}">
 		<td>${movie.Name}</td><td>${movieTheater}</td>
 		<td>${formatDate(date)}</td>
 		<td>
@@ -105,7 +105,7 @@ <h1>Netflix: Book a Movie...</h1>
 
 <script type="text/javascript">
 	var genre="Cartoons", pageIndex=1, pageSize=3, pageCount=0,
-		cart = { bookings: {}, count: 0, sortBy:0 }, bookingCtxs = [], selectedBooking;
+		cart = { bookings: {}, count: 0, sortBy:0 }, bookingItems = [], selectedBooking;
 		
 	getMovies( pageIndex );
 
@@ -126,7 +126,7 @@ <h1>Netflix: Book a Movie...</h1>
 		.tmpl( cart )
 		.appendTo( ".cart", cart );
 
-	var cartCtx = $( ".cart td" ).tmpl();
+	var cartTmplItem = $( ".cart td" ).tmplItem();
 
 	function selectGenre() {
 		$( "#genres li" ).removeClass( "selected" );
@@ -154,7 +154,7 @@ <h1>Netflix: Book a Movie...</h1>
 		}
 		data = data.sort( compare );
 
-		bookingCtxs = $.tmplCmd( "replace", data, bookingCtxs );
+		bookingItems = $.tmplCmd( "replace", data, bookingItems );
 	
 		function compareName( a, b ) {
 			return a == b ? 0 : (((a.movie.Name > b.movie.Name) !== reverse) ? 1 : -1);
@@ -207,7 +207,7 @@ <h1>Netflix: Book a Movie...</h1>
 			booking.quantity++;
 		} else {
 			cart.count++;
-			$.tmplCmd( "update", cartCtx );
+			$.tmplCmd( "update", cartTmplItem );
 			booking = { movie: movie, date: new Date(), quantity: 1, movieTheater: "" };
 		}
 		selectBooking( booking );
@@ -216,12 +216,12 @@ <h1>Netflix: Book a Movie...</h1>
 	function selectBooking( booking ) {
 		if ( selectedBooking ) {
 			if ( selectedBooking === booking ) {
-				updateBooking( bookingCtx( selectedBooking ));
+				updateBooking( bookingItem( selectedBooking ));
 				return;
 			}
 			// Collapse previously selected booking, and switch to non-edit view
 			var oldSelected = selectedBooking; 
-			$( "div", bookingCtx( oldSelected ).nodes ).animate( { height: 0 }, 500, function() { 
+			$( "div", bookingItem( oldSelected ).nodes ).animate( { height: 0 }, 500, function() { 
 				switchView( oldSelected );
 			});
 		}
@@ -237,8 +237,8 @@ <h1>Netflix: Book a Movie...</h1>
 				.tmpl( booking, { animate: true, rendered: onBookingEditRendered } )
 				.appendTo( "#bookingsList" ).last()[0];
 			
-			var newCtx = $.tmpl( bookingNode );
-			bookingCtxs.push( newCtx );
+			var newItem = $.tmplItem( bookingNode );
+			bookingItems.push( newItem );
 		}
 	}
 
@@ -246,31 +246,31 @@ <h1>Netflix: Book a Movie...</h1>
 		if ( !booking ) {
 			return;
 		}
-		var ctx = bookingCtx( booking ),
+		var item = bookingItem( booking ),
 			rendered = edit ? onBookingEditRendered  : onBookingRendered;
-		if ( ctx.rendered !== rendered) {
-			ctx.tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates(); 
-			ctx.rendered = rendered; 
-			$.tmplCmd( "update", ctx );
+		if ( item.rendered !== rendered) {
+			item.tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates(); 
+			item.rendered = rendered; 
+			$.tmplCmd( "update", item );
 		}
 	}
 
-	function onMovieRendered( ctx ) { 
-      	$( "div", ctx.nodes ).fadeIn( 4000 );
-		$( ".buyButton", ctx.nodes ).click( function() { 
-			buyTickets( ctx.data ); 
+	function onMovieRendered( item ) { 
+      	$( "div", item.nodes ).fadeIn( 4000 );
+		$( ".buyButton", item.nodes ).click( function() { 
+			buyTickets( item.data ); 
 		});
 	}
 
-	function onBookingRendered( ctx ) {
-		$( ctx.nodes ).click( function() { 
-			selectBooking( ctx.data );
+	function onBookingRendered( item ) {
+		$( item.nodes ).click( function() { 
+			selectBooking( item.data );
 		});
-		$( ".close", ctx.nodes ).click( removeBooking );
+		$( ".close", item.nodes ).click( removeBooking );
 	}
 
-	function onBookingEditRendered( ctx ) {
-		var data = ctx.data, nodes = ctx.nodes;
+	function onBookingEditRendered( item ) {
+		var data = item.data, nodes = item.nodes;
 		
 		$( nodes[0] ).click( function() { 
 			selectBooking();
@@ -280,58 +280,58 @@ <h1>Netflix: Book a Movie...</h1>
 		
 		$( ".date", nodes ).change( function() {
 			data.date = $(this).datepicker( "getDate" );
-			updateBooking( ctx );
+			updateBooking( item );
 		})
 		.datepicker({ dateFormat: "DD, d MM, yy" });
 
 		$( ".quantity", nodes ).change( function() {
 			data.quantity = $(this).val();
-			updateBooking( ctx );
+			updateBooking( item );
 		});
 
 		$( ".theater", nodes ).change( function() {
 			data.movieTheater = $(this).val();
-			updateBooking( ctx );
+			updateBooking( item );
 		});
 
-		if ( ctx.animate ) {
+		if ( item.animate ) {
 			$( "div", nodes ).css( "height", 0 ).animate( { height: 116 }, 500 );
 		}
 	}
 
-	function updateBooking( ctx ) {
-		ctx.animate = false;
-		$.tmplCmd( "update", ctx );
-		ctx.animate = true;
+	function updateBooking( item ) {
+		item.animate = false;
+		$.tmplCmd( "update", item );
+		item.animate = true;
 	}
 
 	function removeBooking() {
-		var booking = $.tmpl(this).data;
+		var booking = $.tmplItem(this).data;
 		if ( booking === selectedBooking ) {
 			selectedBooking = null;
 		}
 		delete cart.bookings[booking.movie.Id];
 		cart.count--;
-		$.tmplCmd( "update", cartCtx );
-		$.tmplCmd( "remove", booking, bookingCtxs );
+		$.tmplCmd( "update", cartTmplItem );
+		$.tmplCmd( "remove", booking, bookingItems );
 		return false; 
 	}
 	
 	function removeBookings() {
-		$.tmplCmd( "remove", bookingCtxs );
-		bookingCtxs = [];
+		$.tmplCmd( "remove", bookingItems );
+		bookingItems = [];
 		cart.count = 0;
 		cart.bookings = {};
 		selectedBooking = null;
-		$.tmplCmd( "update", cartCtx );
+		$.tmplCmd( "update", cartTmplItem );
 	}
 	
 	function formatDate( date ) {
 		return date.toLocaleDateString();
 	}
 
-	function bookingCtx( booking ) {
-		return $.tmplCmd( "find", booking, bookingCtxs)[0];
+	function bookingItem( booking ) {
+		return $.tmplCmd( "find", booking, bookingItems)[0];
 	}
 </script>
 
diff --git a/demos/movies/PagesTmplPlus/movies3.html b/demos/movies/PagesTmplPlus/movies3.html
index b32c671..f2e4b24 100644
--- a/demos/movies/PagesTmplPlus/movies3.html
+++ b/demos/movies/PagesTmplPlus/movies3.html
@@ -79,7 +79,7 @@ <h1>Netflix: Book a Movie...</h1>
 </script>
 
 <script id="bookingTitleTmpl" type="text/html">
-	<tr class="bookingTitle${$ctx.mode}">
+	<tr class="bookingTitle${$item.mode}">
 		<td>${movie.Name}</td><td>${movieTheater}</td>
 		<td>${formatDate(date)}</td>
 		<td>
@@ -105,7 +105,7 @@ <h1>Netflix: Book a Movie...</h1>
 
 <script type="text/javascript">
 	var genre="Cartoons", pageIndex=1, pageSize=3, pageCount=0,
-		cart = { bookings: {}, count: 0, sortBy:0 }, bookingCtxs = [], selectedBooking;
+		cart = { bookings: {}, count: 0, sortBy:0 }, bookingItems = [], selectedBooking;
 		
 	getMovies( pageIndex );
 
@@ -124,7 +124,7 @@ <h1>Netflix: Book a Movie...</h1>
 		.empty()
 		.append( "#cartTmpl", cart );
 
-	var cartCtx = $( ".cart td" ).tmpl();
+	var cartTmplItem = $( ".cart td" ).tmplItem();
 
 	function selectGenre() {
 		$( "#genres li" ).removeClass( "selected" );
@@ -152,7 +152,7 @@ <h1>Netflix: Book a Movie...</h1>
 		}
 		data = data.sort( compare );
 
-		bookingCtxs = $.tmplCmd( "replace", data, bookingCtxs );
+		bookingItems = $.tmplCmd( "replace", data, bookingItems );
 	
 		function compareName( a, b ) {
 			return a == b ? 0 : (((a.movie.Name > b.movie.Name) !== reverse) ? 1 : -1);
@@ -202,7 +202,7 @@ <h1>Netflix: Book a Movie...</h1>
 			booking.quantity++;
 		} else {
 			cart.count++;
-			$.tmplCmd( "update", cartCtx );
+			$.tmplCmd( "update", cartTmplItem );
 			booking = { movie: movie, date: new Date(), quantity: 1, movieTheater: "" };
 		}
 		selectBooking( booking );
@@ -211,12 +211,12 @@ <h1>Netflix: Book a Movie...</h1>
 	function selectBooking( booking ) {
 		if ( selectedBooking ) {
 			if ( selectedBooking === booking ) {
-				updateBooking( bookingCtx( selectedBooking ));
+				updateBooking( bookingItem( selectedBooking ));
 				return;
 			}
 			// Collapse previously selected booking, and switch to non-edit view
 			var oldSelected = selectedBooking; 
-			$( "div", bookingCtx( oldSelected ).nodes ).animate( { height: 0 }, 500, function() { 
+			$( "div", bookingItem( oldSelected ).nodes ).animate( { height: 0 }, 500, function() { 
 				switchView( oldSelected );
 			});
 		}
@@ -230,8 +230,8 @@ <h1>Netflix: Book a Movie...</h1>
 			cart.bookings[booking.movie.Id] = booking;
 			$( "#bookingsList" ).append( "#bookingEditTmpl", booking, { animate: true, rendered: onBookingEditRendered } );
 			
-			var newCtx = $( "#bookingsList tr:last" ).tmpl();
-			bookingCtxs.push( newCtx );			
+			var newItem = $( "#bookingsList tr:last" ).tmplItem();
+			bookingItems.push( newItem );			
 		}
 	}
 
@@ -239,31 +239,31 @@ <h1>Netflix: Book a Movie...</h1>
 		if ( !booking ) {
 			return;
 		}
-		var ctx = bookingCtx( booking ),
+		var item = bookingItem( booking ),
 			rendered = edit ? onBookingEditRendered  : onBookingRendered;
-		if ( ctx.rendered !== rendered) {
-			ctx.tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates(); 
-			ctx.rendered = rendered; 
-			$.tmplCmd( "update", ctx );
+		if ( item.rendered !== rendered) {
+			item.tmpl = $( edit ? "#bookingEditTmpl" : "#bookingTitleTmpl" ).templates(); 
+			item.rendered = rendered; 
+			$.tmplCmd( "update", item );
 		}
 	}
 
-	function onMovieRendered( ctx ) { 
-      	$( "div", ctx.nodes ).fadeIn( 4000 );
-		$( ".buyButton", ctx.nodes ).click( function() { 
-			buyTickets( ctx.data ); 
+	function onMovieRendered( item ) { 
+      	$( "div", item.nodes ).fadeIn( 4000 );
+		$( ".buyButton", item.nodes ).click( function() { 
+			buyTickets( item.data ); 
 		});
 	}
 
-	function onBookingRendered( ctx ) {
-		$( ctx.nodes ).click( function() { 
-			selectBooking( ctx.data );
+	function onBookingRendered( item ) {
+		$( item.nodes ).click( function() { 
+			selectBooking( item.data );
 		});
-		$( ".close", ctx.nodes ).click( removeBooking );
+		$( ".close", item.nodes ).click( removeBooking );
 	}
 
-	function onBookingEditRendered( ctx ) {
-		var data = ctx.data, nodes = ctx.nodes;
+	function onBookingEditRendered( item ) {
+		var data = item.data, nodes = item.nodes;
 		
 		$( nodes[0] ).click( function() { 
 			selectBooking();
@@ -273,58 +273,58 @@ <h1>Netflix: Book a Movie...</h1>
 		
 		$( ".date", nodes ).change( function() {
 			data.date = $(this).datepicker( "getDate" );
-			updateBooking( ctx );
+			updateBooking( item );
 		})
 		.datepicker({ dateFormat: "DD, d MM, yy" });
 
 		$( ".quantity", nodes ).change( function() {
 			data.quantity = $(this).val();
-			updateBooking( ctx );
+			updateBooking( item );
 		});
 
 		$( ".theater", nodes ).change( function() {
 			data.movieTheater = $(this).val();
-			updateBooking( ctx );
+			updateBooking( item );
 		});
 
-		if ( ctx.animate ) {
+		if ( item.animate ) {
 			$( "div", nodes ).css( "height", 0 ).animate( { height: 116 }, 500 );
 		}
 	}
 
-	function updateBooking( ctx ) {
-		ctx.animate = false;
-		$.tmplCmd( "update", ctx );
-		ctx.animate = true;
+	function updateBooking( item ) {
+		item.animate = false;
+		$.tmplCmd( "update", item );
+		item.animate = true;
 	}
 
 	function removeBooking() {
-		var booking = $.tmpl(this).data;
+		var booking = $.tmplItem(this).data;
 		if ( booking === selectedBooking ) {
 			selectedBooking = null;
 		}
 		delete cart.bookings[booking.movie.Id];
 		cart.count--;
-		$.tmplCmd( "update", cartCtx );
-		$.tmplCmd( "remove", booking, bookingCtxs );
+		$.tmplCmd( "update", cartTmplItem );
+		$.tmplCmd( "remove", booking, bookingItems );
 		return false; 
 	}
 	
 	function removeBookings() {
-		$.tmplCmd( "remove", bookingCtxs );
-		bookingCtxs = [];
+		$.tmplCmd( "remove", bookingItems );
+		bookingItems = [];
 		cart.count = 0;
 		cart.bookings = {};
 		selectedBooking = null;
-		$.tmplCmd( "update", cartCtx );
+		$.tmplCmd( "update", cartTmplItem );
 	}
 	
 	function formatDate( date ) {
 		return date.toLocaleDateString();
 	}
 
-	function bookingCtx( booking ) {
-		return $.tmplCmd( "find", booking, bookingCtxs)[0];
+	function bookingItem( booking ) {
+		return $.tmplCmd( "find", booking, bookingItems)[0];
 	}
 </script>
 
diff --git a/demos/samplesCore/basic.html b/demos/samplesCore/basic.html
index 5ffaca7..e0e63c5 100644
--- a/demos/samplesCore/basic.html
+++ b/demos/samplesCore/basic.html
@@ -60,14 +60,14 @@
 
 jQuery(function(){
 	// A template string
-	var tmpl = '<li><a href="${url}">${getName()}</a> {{if $ctx.showCities}}(${cityJoin()}){{/if}}</li>';
+	var tmpl = '<li><a href="${url}">${getName()}</a> {{if $item.showCities}}(${cityJoin()}){{/if}}</li>';
 
 	// Renders one LI, filled with data, then appends it into the UL
 	$.tmpl( tmpl, dataObject )
 		.appendTo( "ul" );
 
 	// Store a string as a compiled template for later use
-	$.templates( "myTmpl", '<li>My template: <a href="${url}">${getName()}</a> {{if $ctx.showCities}}(${cityJoin()}){{/if}}</li>' );
+	$.templates( "myTmpl", '<li>My template: <a href="${url}">${getName()}</a> {{if $item.showCities}}(${cityJoin()}){{/if}}</li>' );
 
 	// Render stored template and insert after target. 
 	// Target wrapped set has more than one element, so rendered template cloned into two places in DOM
@@ -99,8 +99,8 @@
 		.find( "span" )
 		.addClass( "clickable" )
 		.click( function() {
-			var ctx = $.tmpl(this); 
-			alert( ctx.data.firstName + " at " + ctx.data.url );
+			var item = $.tmplItem(this); 
+			alert( item.data.firstName + " at " + item.data.url );
 		});
 
 	// Example of template that has leading or trailing text
@@ -112,11 +112,11 @@
 
 <script id="sometmpl" type="text/html">
 	<li>
-		{{if $ctx.array}}
-			${index($ctx.array)} of ${$ctx.array.length})
+		{{if $item.array}}
+			${index($item.array)} of ${$item.array.length})
 		{{/if}}
 		 <span>${getName()}</span>
-		{{if $ctx.showCities}}
+		{{if $item.showCities}}
 			Cities: {{each cities}} ${this} {{/each}}
 		{{else}}
 			No Cities
@@ -130,4 +130,4 @@
 
 <ul><li class="multiple">first</li><li class="multiple">last</li></ul>
 
-<div class="target">Target</div>
\ No newline at end of file
+<div class="target">Target</div>
diff --git a/demos/samplesCore/composition.html b/demos/samplesCore/composition.html
index 6192a6e..f41822e 100644
--- a/demos/samplesCore/composition.html
+++ b/demos/samplesCore/composition.html
@@ -64,7 +64,7 @@
 		.tmpl( people )
 		.appendTo( ".peopleTable" );
 	$( "#tmplSeparator" )
-		.tmpl( {} )
+		.tmpl()
 		.appendTo( ".peopleTable" );
 });
 </script>
diff --git a/demos/samplesCore/parameters.html b/demos/samplesCore/parameters.html
index 7dec203..d559f00 100644
--- a/demos/samplesCore/parameters.html
+++ b/demos/samplesCore/parameters.html
@@ -89,7 +89,7 @@
 </script>
 
 <script id="tmplSeparator" type="text/html">
-	<tr class="${$ctx.type}separator"><td colspan="3"></td></tr>
+	<tr class="${$item.type}separator"><td colspan="3"></td></tr>
 </script>
 
 <table class="peopleTable"><tbody>
diff --git a/demos/samplesTmplPlus/basic.html b/demos/samplesTmplPlus/basic.html
index 774ba76..e0e63c5 100644
--- a/demos/samplesTmplPlus/basic.html
+++ b/demos/samplesTmplPlus/basic.html
@@ -1,9 +1,14 @@
 <!--
 This sample illustrates some basic templating features and scenarios.
 -->
+<style type="text/css">
+	.clickable 	{
+		cursor:pointer;
+		color: Blue;
+	}   
+</style>
 <script src="http://code.jquery.com/jquery.js"></script>
-<script src="../../jquery.tmpl.js" type="text/javascript" ></script>
-<script src="../../jquery.tmplPlus.js" type="text/javascript"></script>
+<script src="../../jquery.tmpl.js" type="text/javascript"></script>
 <script>
 
 var dataObject = {
@@ -55,33 +60,67 @@
 
 jQuery(function(){
 	// A template string
-	var tmpl = '<li><a href="${url}">${getName()}</a> {{if $ctx.showCities}}(${cityJoin()}){{/if}}</li>';
-		
+	var tmpl = '<li><a href="${url}">${getName()}</a> {{if $item.showCities}}(${cityJoin()}){{/if}}</li>';
+
 	// Renders one LI, filled with data, then appends it into the UL
-	$("ul").append( tmpl, dataObject, null );
+	$.tmpl( tmpl, dataObject )
+		.appendTo( "ul" );
 
 	// Store a string as a compiled template for later use
-	$.templates( "myTmpl", '<li>My template: <a href="${url}">${getName()}</a> {{if $ctx.showCities}}(${cityJoin()}){{/if}}</li>' );
-	
+	$.templates( "myTmpl", '<li>My template: <a href="${url}">${getName()}</a> {{if $item.showCities}}(${cityJoin()}){{/if}}</li>' );
+
 	// Render stored template and insert after target. 
 	// Target wrapped set has more than one element, so rendered template cloned into two places in DOM
-	$(".multiple").after( "myTmpl", dataObject );
+	$.tmpl( "myTmpl", dataObject )
+		.insertAfter( ".multiple" );
+
+	// Use a template declared in a script block
+	// Appends multiple LIs - one for each item.
+	$( "#sometmpl" )
+		.tmpl( arrayOfDataObjects )
+		.appendTo( "ul" );
+
+	// Store a template declared in a script block as a named template for later use.
+	$( "#sometmpl" ).templates( "peopleList" );
+
+	// Use the named template
+	$.tmpl( "peopleList", arrayOfDataObjects )
+		.appendTo( "ul" );
+
+	// Set options: showCities and array, referenced within the template.
+	$( "#sometmpl" )
+		.tmpl( arrayOfDataObjects, { array: arrayOfDataObjects, showCities: true } )
+		.prependTo( "ul" );
 
-	// Appends multiple LIs for each item. Set options: showCities and array, referenced within the template.
-	$("ul").prepend( "#sometmpl", arrayOfDataObjects, { array: arrayOfDataObjects, showCities: true } );
+	// Getting to the data in a click event.
+	$( "#sometmpl" )
+		.tmpl( arrayOfDataObjects )
+		.prependTo( "ul" )
+		.find( "span" )
+		.addClass( "clickable" )
+		.click( function() {
+			var item = $.tmplItem(this); 
+			alert( item.data.firstName + " at " + item.data.url );
+		});
 
 	// Example of template that has leading or trailing text
-	$("#target").before( "#leadingOrTrailingText", arrayOfDataObjects );
+	$( "#leadingOrTrailingText" )
+		.tmpl( arrayOfDataObjects )
+		.insertBefore( ".target" );
 });
 </script>
 
 <script id="sometmpl" type="text/html">
-	<li>${index($ctx.array)} of ${$ctx.array.length}) <a href="${url}">${getName()}</a>
-	{{if $ctx.showCities}}
-		Cities: {{each cities}} ${this} {{/each}}
-	{{else}}
-		No Cities
-	{{/if}}
+	<li>
+		{{if $item.array}}
+			${index($item.array)} of ${$item.array.length})
+		{{/if}}
+		 <span>${getName()}</span>
+		{{if $item.showCities}}
+			Cities: {{each cities}} ${this} {{/each}}
+		{{else}}
+			No Cities
+		{{/if}}
 	</li>
 </script>
 
@@ -91,4 +130,4 @@
 
 <ul><li class="multiple">first</li><li class="multiple">last</li></ul>
 
-<div id="target">Target</div>
+<div class="target">Target</div>
diff --git a/demos/samplesTmplPlus/parameters.html b/demos/samplesTmplPlus/parameters.html
index 77ce819..f7c4232 100644
--- a/demos/samplesTmplPlus/parameters.html
+++ b/demos/samplesTmplPlus/parameters.html
@@ -89,7 +89,7 @@
 </script>
 
 <script id="tmplSeparator" type="text/html">
-	<tr class="${$ctx.type}separator"><td colspan="3"></td></tr>
+	<tr class="${$item.type}separator"><td colspan="3"></td></tr>
 </script>
 
 <table class="peopleTable"><tbody>
diff --git a/jquery.tmpl.js b/jquery.tmpl.js
index 416910a..fc42094 100644
--- a/jquery.tmpl.js
+++ b/jquery.tmpl.js
@@ -5,33 +5,33 @@
  * Dual licensed under the MIT or GPL Version 2 licenses.
  */
 (function( jQuery, undefined ){
-	var oldManip = jQuery.fn.domManip, tCtxAtt = "_tmplctx", itm, ob,
-		newCtxs = {}, appendToCtxs, topCtx = { key: 0, data: {} }, ctxKey = 0, cloneIndex = 0;
+	var oldManip = jQuery.fn.domManip, tmplItmAtt = "_tmplitem",
+		newTmplItems = {}, appendToTmplItems, topTmplItem = { key: 0, data: {} }, itemKey = 0, cloneIndex = 0;
 
-	function newCtx( options, parentCtx, fn, data ) {
-		// Returns a template context for a new instance of a template. 
-		// The content field is a hierarchical array of strings and nested contexts (to be
+	function newTmplItem( options, parentItem, fn, data ) {
+		// Returns a template item data structure for a new rendered instance of a template (a 'template item'). 
+		// The content field is a hierarchical array of strings and nested items (to be
 		// removed and replaced by nodes field of dom elements, once inserted in DOM).
-		var newCtx = { 
-			data: data || (parentCtx ? parentCtx.data : {}),
+		var newItem = { 
+			data: data || (parentItem ? parentItem.data : {}),
 			tmpl: null,
-			parent: parentCtx || null,
+			parent: parentItem || null,
 			nodes: [],
 			nest: nest
 		};
 		if ( options ) {
-			jQuery.extend( newCtx, options, { nodes: [], parent: parentCtx } );
+			jQuery.extend( newItem, options, { nodes: [], parent: parentItem } );
 			fn = fn || (typeof options.tmpl === "function" ? options.tmpl : null);
 		}
 		if ( fn ) {
 			// Build the hierarchical content to be used during insertion into DOM
-			newCtx.tmpl = fn;
-			newCtx.content = newCtx.tmpl( jQuery, newCtx );
-			newCtx.key = ++ctxKey;
-			// Keep track of new context, until it is stored as jQuery Data on DOM element
-			newCtxs[ctxKey] = newCtx;
+			newItem.tmpl = fn;
+			newItem.content = newItem.tmpl( jQuery, newItem );
+			newItem.key = ++itemKey;
+			// Keep track of new item, until it is stored as jQuery Data on DOM element
+			newTmplItems[itemKey] = newItem;
 		}
-		return newCtx;
+		return newItem;
 	}
 
 	// Override appendTo etc., in order to provide support for targeting multiple elements. (This code would disappear if integrated in jquery core).
@@ -46,7 +46,7 @@
 			var ret = [], insert = jQuery( selector ),
 				parent = this.length === 1 && this[0].parentNode;
 
-			appendToCtxs = newCtxs || {};
+			appendToTmplItems = newTmplItems || {};
 			if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
 				insert[ original ]( this[0] );
 				ret = this;
@@ -60,25 +60,26 @@
 				cloneIndex = 0;
 				ret = this.pushStack( ret, name, insert.selector );
 			}
-			var ctxs = appendToCtxs;
-			appendToCtxs = null;
-			jQuery.tmpl.complete( ctxs );
+			var items = appendToTmplItems;
+			appendToTmplItems = null;
+			jQuery.tmpl.complete( items );
 			return ret;
 		};
 	});
 
 	jQuery.fn.extend({
-		tmpl: function( data, options, parentCtx ) {
-			if ( arguments.length ) {
-				// Use first wrapped element as template markup.
-				// Return wrapped set of fragments obtained by evaluating template against data.
-				return jQuery.tmpl( this[0], data, options, parentCtx, parentCtx === undefined );
-			}	
-			// If no arguments, used to get template context of first wrapped DOM element, 
-			// or, if it is a template script block, the compiled template
-			return jQuery.tmpl( this[0] );
+		// Use first wrapped element as template markup.
+		// Return wrapped set of template items, obtained by rendering template against data.
+		tmpl: function( data, options, parentItem ) {
+			return jQuery.tmpl( this[0], data, options, parentItem, parentItem === undefined );
 		},
 
+		// Find which rendered template item the first wrapped DOM element belongs to 
+		tmplItem: function() {
+			return jQuery.tmplItem( this[0] );
+		},
+
+		// Consider the first wrapped element as a template declaration, and get the compiled template or store it as a named template. 
 		templates: function( name ) {
 			return jQuery.templates( name, this[0] );
 		},
@@ -87,12 +88,12 @@
 			// This appears to be a bug in the appendTo, etc. implementation
 			// it should be doing .call() instead of .apply(). See #6227
 			if ( args[0].nodeType ) {
-				var dmArgs = jQuery.makeArray( arguments ), argsLength = args.length, i = 0, ctx;
-				while ( i < argsLength && !(ctx = jQuery.data( args[i++], "tmplCtx" ))) {};
+				var dmArgs = jQuery.makeArray( arguments ), argsLength = args.length, i = 0, item;
+				while ( i < argsLength && !(item = jQuery.data( args[i++], "tmplItem" ))) {};
 				if ( argsLength > 1 ) {
 					dmArgs[0] = [jQuery.makeArray( args )];
 				}
-				if ( ctx && cloneIndex ) {
+				if ( item && cloneIndex ) {
 					dmArgs[2] = function( fragClone ) {
 						// Handler called by oldManip when rendered template has been inserted into DOM.
 						jQuery.tmpl.afterManip( this, fragClone, callback );
@@ -103,94 +104,84 @@
 				oldManip.apply( this, arguments );
 			}
 			cloneIndex = 0;
-			if ( !appendToCtxs ) {
-				jQuery.tmpl.complete( newCtxs );
+			if ( !appendToTmplItems ) {
+				jQuery.tmpl.complete( newTmplItems );
 			}
 			return this;
 		}
 	});
 
 	jQuery.extend({
-		tmpl: function( tmpl, data, options, parentCtx, domFrag ) {
-			var fn, targetCtx, coll, ret, wrapped;
-			if ( parentCtx && !tmpl && !data && !options ) {
-				// Re-evaluate rendered template for the parentCtx
-				targetCtx = parentCtx;
-				tmpl =  parentCtx.tmpl;
-				newCtxs[parentCtx.key] = parentCtx;
-			} else if ( domFrag || arguments.length === 2 ) {
+		// Return wrapped set of template items, obtained by rendering template against data.
+		tmpl: function( tmpl, data, options, parentItem ) {
+			var ret, topLevel = !parentItem;
+			if ( topLevel ) {
 				// This is a top-level tmpl call (not from a nested template using {{tmpl}})
-				parentCtx = topCtx;
-				wrapped = true;
-			}
-			if ( typeof tmpl === "string" ) {
-				if ( fn = jQuery.templates[ tmpl ] ) {
-				 	// Use a pre-defined template, if available
-					tmpl = fn;
-				} else {
-					// This is an HTML string being passed directly in.
-					tmpl = buildTmplFn( tmpl )
-				}
-			}
-			if ( tmpl instanceof jQuery ) {
-				tmpl = tmpl.get(0) || {};
-			}
-			if ( tmpl.nodeType && arguments.length === 1 && tmpl.nodeType === 1 ) {
-				// Return template context for an element.
-				while ( tmpl && !(tmplCtx = jQuery.data( tmpl, "tmplCtx" )) && (tmpl = tmpl.parentNode) ) {}
-				return tmplCtx || topCtx;
-			}
-			
-			// If arguments.length > 1, render template against data, and return fragments ready for DOM insertion.
-			if ( typeof tmpl === "function" ) {
-				fn = tmpl;
-			} else if ( tmpl.nodeType ) {
-				// If this is a template block, generate tmpl function and cache.
-				fn = jQuery.data( tmpl, "tmpl" ) || jQuery.data( tmpl, "tmpl", buildTmplFn( tmpl.innerHTML ));
-			}
-			if ( !fn ) {
-				return []; //Could throw...
-			}
-			if ( targetCtx ) {
-				// The context is already associated with DOM - this is a refresh.
-				targetCtx.tmpl = fn;
-				targetCtx.nodes = [];
-				// Rebuild, without creating a new template context
-				return jQuery( build( targetCtx, null, targetCtx.tmpl( jQuery, targetCtx ) ));
-			}
-			if ( !parentCtx && arguments.length > 3) {
-				return fn; 
+				parentItem = topTmplItem;
+				tmpl = jQuery.templates[tmpl] || jQuery.templates( null, tmpl );
+			} else if ( !tmpl ) {
+				// The item is already associated with DOM - this is a refresh.
+				// Re-evaluate rendered template for the parentItem
+				tmpl =  parentItem.tmpl;
+				newTmplItems[parentItem.key] = parentItem;
+				parentItem.nodes = [];
+				// Rebuild, without creating a new template item
+				return jQuery( build( parentItem, null, parentItem.tmpl( jQuery, parentItem ) ));
+			} 
+			if ( !tmpl ) {
+				return []; // Could throw...
 			}
 			if ( typeof data === "function" ) {
-				data = data.call( parentCtx.data || {}, parentCtx );
+				data = data.call( parentItem.data || {}, parentItem );
 			}
-
 			ret = jQuery.isArray( data ) ? 
 				jQuery.map( data, function( dataItem ) {
-					return newCtx( options, parentCtx, fn, dataItem );
+					return newTmplItem( options, parentItem, tmpl, dataItem );
 				}) :
-				[ newCtx( options, parentCtx, fn, data ) ];
+				[ newTmplItem( options, parentItem, tmpl, data ) ];
+
+			return topLevel ? jQuery( build( parentItem, null, ret ) ) : ret;
+		},
 
-			ret = domFrag || wrapped ? build( parentCtx, null, ret ) : ret;
-			return wrapped ? jQuery( ret) : ret;
+		// Return rendered template item for an element.
+		tmplItem: function( elem ) {
+			var tmplItem;
+			if ( elem instanceof jQuery ) {
+				elem = tmpl[0];
+			}
+			while ( elem && elem.nodeType === 1 && !(tmplItem = jQuery.data( elem, "tmplItem" )) && (elem = elem.parentNode) ) {}
+			return tmplItem || topTmplItem;
 		},
 
+		// Set: 
 		// Use $.templates( name, tmpl ) to cache a named template, 
 		// where tmpl is a template string, a script element or a jQuery instance wrapping a script element, etc.
 		// Use $( "selector" ).templates( name ) to provide access by name to a script block template declaration.
 
+		// Get: 
 		// Use $.templates( name ) to access a cached template.
 		// Also $( selectorToScriptBlock ).templates(), or $.templates( null, templateString ) 
 		// will return the compiled template, without adding a name reference.  
 		templates: function( name, tmpl ) {
 			if (tmpl) {
 				// Compile template and associate with name
-				return jQuery.templates[name] = jQuery.tmpl( tmpl, null, null, null );
+				if ( typeof tmpl === "string" ) {
+					// This is an HTML string being passed directly in.
+					tmpl = buildTmplFn( tmpl )
+				} else if ( tmpl instanceof jQuery ) {
+					tmpl = tmpl[0] || {};
+				} 
+				if ( tmpl.nodeType ) {
+					// If this is a template block, use cached copy, or generate tmpl function and cache.
+					tmpl = jQuery.data( tmpl, "tmpl" ) || jQuery.data( tmpl, "tmpl", buildTmplFn( tmpl.innerHTML ));
+				}
+				return name ? (jQuery.templates[name] = tmpl) : tmpl;
 			}
 			// Return named compiled template
-			return jQuery.templates[name] || 
-				// Could use htmlExpr.test( tmpl) ? ... : null; to avoid spurious scenarios of html instead of selector
-				jQuery( name ).tmpl( null, null, null ); 
+			return typeof name !== "string" ? null : 
+				(jQuery.templates[name] || 
+					// If not in map, treat as a selector. 
+					jQuery.templates( null, jQuery( name ))); 
 		},
 
 		encode: function( text ) {
@@ -203,7 +194,7 @@
 		tags: {
 			"tmpl": {
 				_default: { $2: "null" },
-				prefix: "if($notnull_1){_=_.concat($ctx.nest($1,$2));}"
+				prefix: "if($notnull_1){_=_.concat($item.nest($1,$2));}"
 				// tmpl target parameter can be of type function, so use $1, not $1a (so not auto detection of functions)
 				// This means that {{tmpl foo}} treats foo as a template (which IS a function). 
 				// Explicit parens can be used if foo is a function that returns a template: {{tmpl foo()}}.
@@ -230,12 +221,12 @@
 		},
 
 		// This stub can be overridden, e.g. in jquery.tmplPlus for providing rendered events
-		complete: function( ctxs ) {
-			newCtxs = {};
+		complete: function( items ) {
+			newTmplItems = {};
 		},
 
 		// Call this from code which overrides domManip, or equivalent
-		// Manage cloning/storing template contexts etc.
+		// Manage cloning/storing template items etc.
 		afterManip: function afterManip( elem, fragClone, callback ) {
 			// Provides cloned fragment ready for fixup prior to and after insertion into DOM
 			var content = fragClone.nodeType === 11 ?
@@ -245,23 +236,23 @@
 			// Return fragment to original caller (e.g. append) for DOM insertion
 			callback.call( elem, fragClone );
 
-			// Fragment has been inserted:- Add inserted nodes to context. Replace inserted element annotations by jQuery.data.
-			storeContexts( content );
+			// Fragment has been inserted:- Add inserted nodes to tmplItem data structure. Replace inserted element annotations by jQuery.data.
+			storeTmplItems( content );
 			cloneIndex++;
 		}
 	});
 
 	//========================== Private helper functions, used by code above ========================== 
 	  
-	function build( ctx, parent, content ) {
+	function build( tmplItem, parent, content ) {
 		// Convert hierarchical content into flat string array 
 		// and finally return array of fragments ready for DOM insertion
-		var frag, el, ret = jQuery.map( content, function( item ) {
+		var frag, ret = jQuery.map( content, function( item ) {
 			return (typeof item === "string") ? 
-				// Insert context annotations, to be converted to jQuery.data( "tmplCtx" ) when elems are inserted into DOM.
-				item.replace( /(<\w+)([^>]*)/g, "$1 " + tCtxAtt + "=\"" + ctx.key + "\" $2" ) : 
-				// This is a child template context. Build nested template.
-				build( item, ctx, item.content );
+				// Insert template item annotations, to be converted to jQuery.data( "tmplItem" ) when elems are inserted into DOM.
+				item.replace( /(<\w+)([^>]*)/g, "$1 " + tmplItmAtt + "=\"" + tmplItem.key + "\" $2" ) : 
+				// This is a child template item. Build nested template.
+				build( item, tmplItem, item.content );
 		});
 		if ( parent ) {
 			// nested template
@@ -277,7 +268,7 @@
 //					frag = jQuery.buildFragment( [middle] ); // If buildFragment was public, could do these two lines instead
 //					frag = frag.cacheable ? frag.fragment.cloneNode(true) : frag.fragment;
 
-			storeContexts( frag );
+			storeTmplItems( frag );
 			if ( before ) {
 				frag = unencode( before ).concat(frag);
 			}
@@ -297,8 +288,8 @@
 
 	// Generate a reusable function that will serve to render a template against data
 	function buildTmplFn( markup ) {
-		return new Function("jQuery","$ctx",
-			"var $=jQuery,_=[],$data=$ctx.data;" +
+		return new Function("jQuery","$item",
+			"var $=jQuery,_=[],$data=$item.data;" +
 
 			// Introduce the data as local variables using with(){}
 			"with($data){_.push('" +
@@ -320,12 +311,12 @@
 						args = args ? ("," + unescape( args ) + ")") : (parens ? ")" : "");
 						if ( parens && target.indexOf(".") > -1 ) {
 							// Support for target being things like a.toLowerCase(); 
-							// In that case don't call with ctx as this pointer. Just evaluate...
+							// In that case don't call with item as 'this' pointer. Just evaluate...
 							target += parens;
 							args = "";
 						}
-						expr = args ? ("(" + target + ").call($ctx" + args) : target;
-						exprAutoFnDetect = args ? expr: "(typeof(" +  target + ")==='function'?(" +  target + ").call($ctx):(" +  target + "))";
+						expr = args ? ("(" + target + ").call($item" + args) : target;
+						exprAutoFnDetect = args ? expr: "(typeof(" +  target + ")==='function'?(" +  target + ").call($item):(" +  target + "))";
 					} else {
 						expr = def["$1"] || "null";
 					}
@@ -338,7 +329,7 @@
 							.split( "$2" ).join( fnargs ?
 								fnargs.replace( /\s*([^\(]+)\s*(\((.*?)\))?/g, function( all, name, parens, params ) {
 									params = params ? ("," + params + ")") : (parens ? ")" : "");
-									return params ? ("(" + name + ").call($ctx" + params) : all;
+									return params ? ("(" + name + ").call($item" + params) : all;
 								})
 								: (def["$2"]||"")
 							) +
@@ -354,63 +345,69 @@
 
 	function nest( tmpl, data, options ) {
 		// nested template, using {{tmpl}} tag
-		return jQuery.tmpl( typeof tmpl === "string" ? jQuery.templates( tmpl ) : tmpl, data, options, this );
+		return jQuery.tmpl( 
+			typeof tmpl === "string" ? jQuery.templates( tmpl ) : tmpl, 
+			data, 
+			options, 
+			this 
+		);
 	}
 
-	// Store template contexts in jQuery.data(), ensuring a unique context for each rendered template instance. 
-	function storeContexts( content ) {
-		var keySuffix = "_" + cloneIndex, elem, elems, newClonedCtx = {};
+	// Store template items in jQuery.data(), ensuring a unique tmplItem data data structure for each rendered template instance. 
+	function storeTmplItems( content ) {
+		var keySuffix = "_" + cloneIndex, elem, elems, newClonedItems = {};
 		for ( var i = 0, l = content.length; i < l; i++ ) {
 			if ( (elem = content[i]).nodeType !== 1 ) {
 				continue;
 			}
 			elems = elem.getElementsByTagName("*");
 			for ( var j = 0, m = elems.length; j < m; j++) {
-				processCtxKey( elems[j] );
+				processItemKey( elems[j] );
 			}
-			processCtxKey( elem );
+			processItemKey( elem );
 		}
 
-		function processCtxKey( el ) {
-			var pntKey, pntNode = el, pntCtx, pntNodeCtx, ctx, key;
-			// Ensure that each rendered template inserted into the DOM has its own template context,
-			if ( key = el.getAttribute( tCtxAtt )) {
-				while ((pntNode = pntNode.parentNode).nodeType === 1 && !(pntKey = pntNode.getAttribute( tCtxAtt ))) { }
+		function processItemKey( el ) {
+			var pntKey, pntNode = el, pntItem, pntNodeItem, item, key;
+			// Ensure that each rendered template inserted into the DOM has its own template item,
+			if ( key = el.getAttribute( tmplItmAtt )) {
+				while ((pntNode = pntNode.parentNode).nodeType === 1 && !(pntKey = pntNode.getAttribute( tmplItmAtt ))) { }
 				if ( pntKey !== key ) {
-					// The next ancestor with a _tmplctx expando is on a different key than this one.
-					// So this is a top-level element within this template context
-					ctx = newCtxs[key];
+					// The next ancestor with a _tmplitem expando is on a different key than this one.
+					// So this is a top-level element within this template item
+					item = newTmplItems[key];
 					if ( cloneIndex ) {
-						cloneContext( key );
+						cloneItem( key );
 					}
-					pntNodeCtx = el.parentNode;
-					pntNodeCtx = pntNodeCtx.nodeType === 11 ? 0 : (pntNodeCtx.getAttribute( tCtxAtt ) || 0);
+					pntNodeItem = el.parentNode;
+					pntNodeItem = pntNodeItem.nodeType === 11 ? 0 : (pntNodeItem.getAttribute( tmplItmAtt ) || 0);
 				}
-				el.removeAttribute( tCtxAtt );
-			} else if ( cloneIndex && (ctx = jQuery.data( el, "tmplCtx" )) ) {
+				el.removeAttribute( tmplItmAtt );
+			} else if ( cloneIndex && (item = jQuery.data( el, "tmplItem" )) ) {
 				// This was a rendered element, cloned during append or appendTo etc.
-				// Ctx stored in jQuery data has already been cloned in cloneCopyEvent. We must replace it with a fresh cloned context. 
-				cloneContext( ctx.key );
-				newCtxs[ctx.key] = ctx;
-				pntNodeCtx = jQuery.data( el.parentNode, "tmplCtx" );
-				pntNodeCtx = pntNodeCtx ? pntNodeCtx.key : 0;
+				// TmplItem stored in jQuery data has already been cloned in cloneCopyEvent. We must replace it with a fresh cloned tmplItem. 
+				cloneItem( item.key );
+				newTmplItems[item.key] = item;
+				pntNodeItem = jQuery.data( el.parentNode, "tmplItem" );
+				pntNodeItem = pntNodeItem ? pntNodeItem.key : 0;
 			}
-			if ( ctx ) {
-				pntCtx = ctx;
-				// Find the template context of the parent element
-				while ( pntCtx && pntCtx.key != pntNodeCtx ) {
-					// Add this element as a top-level node for this context, as well as for any
-					// ancestor contexts between this context and the context of its parent element
-					pntCtx.nodes.push( el );
-					pntCtx = pntCtx.parent;
+			if ( item ) {
+				pntItem = item;
+				// Find the template item of the parent element
+				while ( pntItem && pntItem.key != pntNodeItem ) {
+					// Add this element as a top-level node for this rendered template item, as well as for any
+					// ancestor items between this item and the item of its parent element
+					pntItem.nodes.push( el );
+					pntItem = pntItem.parent;
 				}
-				delete ctx.content; // Could keep this available. Currently deleting to reduce API surface area, and memory use...
-				// Store template context as jQuery data on the element
-				jQuery.data( el, "tmplCtx", ctx );
+				delete item.content; // Could keep this available. Currently deleting to reduce API surface area, and memory use...
+				// Store template item as jQuery data on the element
+				jQuery.data( el, "tmplItem", item );
 			}
-			function cloneContext( key ) {
+			function cloneItem
+			( key ) {
 				key = key + keySuffix;
-				ctx = newClonedCtx[key] = newClonedCtx[key] || newCtx(ctx, newCtxs[ctx.parent.key + keySuffix] || ctx.parent, null, true);
+				item = newClonedItems[key] = newClonedItems[key] || newTmplItem(item, newTmplItems[item.parent.key + keySuffix] || item.parent, null, true);
 			}
 		}
 	}
diff --git a/jquery.tmplPlus.js b/jquery.tmplPlus.js
index bced9d1..68a795a 100644
--- a/jquery.tmplPlus.js
+++ b/jquery.tmplPlus.js
@@ -6,56 +6,56 @@
 	var oldComplete = jQuery.tmpl.complete, oldManip = jQuery.fn.domManip;
 
 	// Override jQuery.tmpl.complete in order to provide rendered event.
-	jQuery.tmpl.complete = function( ctxs ) {
-		oldComplete( ctxs);
-		for ( var ctx in ctxs ) {
-			ctx =  ctxs[ctx]; 
+	jQuery.tmpl.complete = function( items ) {
+		oldComplete( items);
+		for ( var item in items ) {
+			item =  items[item]; 
 			// Raise rendered event
-			if ( ctx.rendered ) {
-				ctx.rendered( ctx );
+			if ( item.rendered ) {
+				item.rendered( item );
 			}
 		}
 	}
 
 	jQuery.extend({
-		tmplCmd: function( command, data, contexts ) {
-			var retCtxs = [], before; 
+		tmplCmd: function( command, data, items ) {
+			var retTmplItems = [], before; 
 			data = jQuery.isArray( data ) ? data : [ data ];
 			switch ( command ) {
 				case "find":
-					return find( data, contexts );
+					return find( data, items );
 				case "replace":
 					data.reverse();
 			}
-			jQuery.each( contexts ? find( data, contexts ) : data, function( i, ctx ) { 
-				coll = ctx.nodes;
+			jQuery.each( items ? find( data, items ) : data, function( i, item ) { 
+				coll = item.nodes;
 				switch ( command ) {
 					case "update":
-						jQuery.tmpl( null, null, null, ctx ).insertBefore( coll[0] );
+						jQuery.tmpl( null, null, null, item ).insertBefore( coll[0] );
 						jQuery( coll ).remove();
 						break;
 					case "remove":
 						jQuery( coll ).remove();
-						if ( contexts ) {
-							contexts.splice( jQuery.inArray( ctx, contexts ), 1 );
+						if ( items ) {
+							items.splice( jQuery.inArray( item, items ), 1 );
 						}
 						break;
 					case "replace":
 						before = before ? 
 							jQuery( coll ).insertBefore( before )[0] : 
 							jQuery( coll ).appendTo( coll[0].parentNode )[0];
-						retCtxs.unshift( ctx );
+						retTmplItems.unshift( item );
 				}
 			});
-			return retCtxs;
-			function find( data, ctxs ) {
-				var found = [], ctx, ci, cl = ctxs.length, dataItem, di = 0, dl = data.length;
+			return retTmplItems;
+			function find( data, items ) {
+				var found = [], item, ci, cl = items.length, dataItem, di = 0, dl = data.length;
 				for ( ; di < dl; ) {
 					dataItem = data[di++]; 
 					for ( ci = 0; ci < cl; ) {
-						ctx = ctxs[ci++];
-						if ( ctx.data === dataItem ) {
-							found.push( ctx );
+						item = items[ci++];
+						if ( item.data === dataItem ) {
+							found.push( item );
 						}
 					}
 				}