Dnd optimized
ConcreteEntity fix