added adaptor factory, removed comment code and fixed comunication to
Communication