Switched Package.pm to the object manager.
Improved object manager handling of User.pm.