Added device simulator