Updated fields classes, response class getting shape