Refactor API Criteria