Index: VKontakte.pm
===================================================================
--- VKontakte.pm	(revision 271)
+++ VKontakte.pm	(revision 272)
@@ -62,7 +62,8 @@
 	for ( keys %args ) {
 		$go->query_param( $_ => $args{$_} );
 	}
-	$keeper->{session}->store_value( vk_redirect_url => $self->{vk_redirect_uri} );
+	my $local_session = $session || $keeper->{session}->get_session;
+	$local_session->set( vk_redirect_url => $self->{vk_redirect_uri} );
 	return $go;
 }
 
@@ -106,19 +107,16 @@
 			warn "No access token in response: ".$res->content."\n";
 			return undef;
 		}
-		$keeper->{session}->store_value( vk_access_token => $access_token );
-		$local_session->{vk_access_token} = $access_token;
-		$keeper->{session}->store_value( vk_user_id => $info->{user_id} );
-		$local_session->{vk_user_id} = $info->{user_id};
+		$local_session->set( vk_access_token => $access_token );
+		$local_session->set( vk_user_id => $info->{user_id} );
 		if ( my $expires = $info->{expires_in} ) {
-			$local_session->{vk_expires} = time + $expires;
-			$keeper->{session}->store_value( vk_expires => $local_session->{vk_expires} );
+			$local_session->set( vk_expires => time + $expires );
 		} else {
-			#$c->user_session->{'expires'} = time + 3600*24;
+			#$local_session->set( vk_expires => time + 3600*24 );
 		}
-		warn "VK: requested access token";
+		warn "VK: requested access token"		if $DEBUG;
 	} else {
-		warn "VK: have access token";
+		warn "VK: have access token"			if $DEBUG;
 	}
 
 	my $req = URI->new( $self->{vk_user_info_url} );
@@ -193,10 +191,7 @@
 		if ( $user_info->{photo} ) {
 			$data{avatar} = $user_info->{photo};
 		}
-		$keeper->{session}->store_value ( %data );
-		while ( my ( $key, $value ) = each %data ) {
-			$local_session->{$key} = $value;
-		}
+		$local_session->set( %data );
 
 	} else {
 		my %data = (
@@ -212,10 +207,7 @@
 		if ( $user_info->{photo} ) {
 			$data{avatar} = $user_info->{photo};
 		}
-		$keeper->{session}->store_value ( %data );
-		while ( my ( $key, $value ) = each %data ) {
-			$local_session->{$key} = $value;
-		}
+		$local_session->set( %data );
 	}
 	return $local_session;
 }