Improved Cordova analyzer