Aleph driver refactoring (auxilliary classes extracted)