Changed from SessionHandler to ResourceHandler
Refactor marking request as handled
Remove TODO