Refactored all objects