--- lib/PXElator/CouchDB.pm	2009/08/30 10:19:44	357
+++ lib/PXElator/CouchDB.pm	2009/08/30 10:29:40	358
@@ -122,13 +122,17 @@
 	$url =~ s/\s+-\S+//g;	# remove command line options
 	$url =~ s/\W+/-/g;
 
-	my $time = $data->{time} = time();
+	my $time = time();
 
-	my @caller_name = ( qw/package file line sub/ );
 	my @caller = caller(0);
 	$caller[3] = (caller(1))[3];
 	$caller[3] =~ s{^.+::}{}; # stip package name from sub
-	$data->{ $caller_name[$_] } = $caller[$_] foreach ( 0 .. $#caller_name );
+	$data->{package} = {
+		time => $time,
+		name => $caller[0],
+		line => $caller[2],
+		caller  => $caller[3],
+	};
 
 	if ( $ENV{DEBUG} ) {