[Aleph connector] Made basic refactoring