Update for new URL's without /extend