Improved WebApp plugin