Improved WebController once more