- Added Query with a generic endpoint. Now the entity is part of the Query