Update signature to require query