Fixed the ConcreteEntities based on the Interface modifications.