Moved IConnectionHandler implementation into separate class