switched to pojo property setup