Added support for simulator