Points connectivity clean

Set up points connectivity structure for interface.

Chris could you please review it when you have time? Many thanks!

Tracker item: 3119