Index: /lang/perl/Data-Feed/trunk/t/02_atom.t
===================================================================
--- /lang/perl/Data-Feed/trunk/t/02_atom.t (revision 16238)
+++ /lang/perl/Data-Feed/trunk/t/02_atom.t (revision 16241)
@@ -1,4 +1,4 @@
 use strict;
-use Test::More (tests => 2);
+use Test::More (tests => 6);
 
 BEGIN {
Index: /lang/perl/Data-Feed/trunk/lib/Data/Feed/Atom/Entry.pm
===================================================================
--- /lang/perl/Data-Feed/trunk/lib/Data/Feed/Atom/Entry.pm (revision 16239)
+++ /lang/perl/Data-Feed/trunk/lib/Data/Feed/Atom/Entry.pm (revision 16241)
@@ -9,4 +9,8 @@
 
 with 'Data::Feed::Web::Entry';
+
+has '+entry' => (
+    isa => 'XML::Atom::Entry'
+);
 
 __PACKAGE__->meta->make_immutable;
Index: /lang/perl/Data-Feed/trunk/lib/Data/Feed/Atom.pm
===================================================================
--- /lang/perl/Data-Feed/trunk/lib/Data/Feed/Atom.pm (revision 16239)
+++ /lang/perl/Data-Feed/trunk/lib/Data/Feed/Atom.pm (revision 16241)
@@ -3,4 +3,5 @@
 package Data::Feed::Atom;
 use Moose;
+use Data::Feed::Atom::Entry;
 
 with 'Data::Feed::Web::Feed';
@@ -49,5 +50,5 @@
     my @entries;
     for my $entry ($_[0]->feed->entries) {
-        push @entries, Data::Feed::Atom::Entry->wrap($entry);
+        push @entries, Data::Feed::Atom::Entry->new(entry => $entry);
     }
 
@@ -58,5 +59,5 @@
     my $self = shift;
     my($entry) = @_;
-    $self->feed->add_entry($entry->unwrap);
+    $self->feed->add_entry($entry->entry);
 }