Formalized ids and routing better...