Moved several functions to LogicModule