Added simulator classes.