Improved featureset of simulator