Fix #335 - Update URI templates to the latest version