OPAL-1910: Using UriBuilders
OPAL-1910: Fixing Overly long method warning