Added url builder.
Merge branch 'urls' into dev