Added paginator_criteria support to service factory