Refactored Objects Package