Added AOP support, dependency injection into entitites