--- a/Lib/IMPL/Web/Handler/RestController.pm	Fri Apr 20 16:06:36 2012 +0400
+++ b/Lib/IMPL/Web/Handler/RestController.pm	Mon Apr 23 01:36:52 2012 +0400
@@ -3,8 +3,11 @@
 
 use IMPL::lang qw(:declare :constants);
 
+
 use IMPL::declare {
 	require => {
+		Exception => 'IMPL::Exception',
+		ArgumentExecption => '-IMPL::InvalidArgumentException',
 		HttpException => 'IMPL::Web::Exception',
         NotFoundException => 'IMPL::Web::NotFoundException'
 	},
@@ -18,6 +21,14 @@
 BEGIN {
 	public property root => PROP_GET | PROP_OWNERSET;
 	public property contract => PROP_GET | PROP_OWNERSET;
+	public property types => PROP_GET | PROP_OWNERSET;
+}
+
+sub CTOR {
+	my ($this) = @_;
+	
+	die ArgimentException->new("types")
+	   if $this->types and ref $this->types ne 'HASH'; 
 }
 
 sub Invoke {
@@ -30,19 +41,22 @@
 	#TODO: path_info is broken for IIS
 	my $pathInfo = $query->path_info;
 	
-	my @segments = split /\//, $pathInfo;
+	my @segments = split /\//, $pathInfo, -1; # keep trailing empty string if present
 	
 	# remove first segment since it's always empty
 	shift @segments;
 	
 	my ($obj,$view) = (pop(@segments) =~ m/(.*?)(?:\.(\w+))?$/);
 	
-	$action->context->{view} = $view;
+	if ($this->types and my $type = $this->types->{$view}) {
+        $action->response->contentType($type);		
+	}
 	
-	my $res = $this->contract->Transform($this->root);
+	my $res = $this->contract->Transform($this->root, { id => '' } );
 	
 	while(@segments) {
-		$res = $this->contract->Transform( $res->InvokeHttpMethod('GET',shift @segments,$action) );
+		my $id = shift @segments;
+		$res = $this->contract->Transform( $res->InvokeHttpMethod('GET',$id,$action), { parent => $res, id => $id } );
 		
 		die NotFoundException->new() unless $res;
 	}