refactored routing convention