Reworked ServletAware code