Add queries and methods FindByName, FindById