Moving POJO logic