Refactored objects in Home to use model data