Criteria api (9/25)

Criteria api