Add support for simulator