Add proper routing to external