Updated POJO Class