Add support for Token source and Addon register Urls