improved routing templates