Core changes, introduce routes