Feature/alias gateway