Removed query and moved to ORM.