Refactor DispatcherHandlerActivity