Add support for some additional URI builder elements

Change-Id: Id4e20636eb9c0762de477201c5abf0cf7546915d
Signed-off-by: Rob Adams <readams@readams.net>