Issue 7: Allow URI mapping to be pluggable