CFY-884 use urls instead of alias mappings