Updated to include full url paths