Simplified connection

Simplified connection down to one class.