Refactor how args are passed to allow-origins to support integration with service map