Added better support for appium