Core updated for the new URI structure