Renamed methods in query supertype for better understanding