Added more consistent POJO practices