Pojo refactored