Refactored objects implementations
Solved conflicts