ApiDispatcher was refactored