New style for connections
Fix #352