Finished adding deferred loading