Added new models and queries for the api