Some refactoring to support the new connection engine architecture.
Authored by: KrinosX 2011-09-09
Parent: [r37]
Child: [r39]