Added filter, group, removed query interfaces.