Updated ApiDispatcher & Auth component