Improved project with pojo classes