Maybe we should attach both name and url?