Websubmit refactoring