Added EntityListeners and Criteria api