Adding base URL support

Change-Id: I74972ec1b57d55a2bd39fbda825c831cf04e35d7