Switch to enums and use RFC6570 URI templates for URIs