Removed hard-coding of url