Added superclass for container and entities