Add name in Entity
Add StateBasedEntity class