Fix another typo
Return correct type
Add/remove query methods