Worked a bit on the connection architecture.