Updates to new url-pattern