Added repository query implementation