Added criteria and entities