criteria builder related interfaces
moved ORM mapping to annotations
small fixes