Corrected routing and template association