Made modifications to fit ConcreteEntities - will fix unit tests later.