changed dtos for adams expected json result, unhacked things a bit