Added calculators and modified some classes.
Added calculators and modified some classes.