make all entity types stop extending Shape