Refactored stub class and submit page