Refactoring...
Added new Pojo objects for JSON