Improved WebController