Refactored objects