Added CompositeEntity and Simulator classes