The rest of the changes for deep linking