added MarkCalculator and Module class