Added core router to collect list of classes