Add query support (part 2 of models)
Add query support (part 2 of models)