Refactored pojo classes
Fixed conflicts