Worked on query building
Worked on builder/model integration