Make criteria optional for querying