pojos and few updates