fixed pojos to match discussion