Adding more user references to core.pp.