Basic connection features are recoded

To use a more durable structure