Changing names and adding core link parser