Add more infos for contact points
Fix variable name usage `definition` -> `name`