Moved routing defs