Removed hard coding of base URLs.