Added HttpModule and some fixes