Criteria overhaul for extensibility