Better Cordova support