Use { source, entity, model } instead of just model in query

This allows us to just have the source with no entity or model in
queries.