Added All and Query class methods