Converted hardcoded URLs to read off proeprties