ConnectionMaker improvement