Add: Subject map route, cleanup routing