Refactored usage of HttpContextBase (needs work)