Resolved pickling issues with deferred loading.