Got rid of composition in API query model