Initial commit
Resolve conflict
Changes on Utils.buildUri