Improvements to Web module