Add 16.5 - extendedcontacts.go