Added ConnectionFactory and Collection classes