Maid 369 refactor routing