Reworked the maker router.