Improved router components