[Completed] Support for Calculation Field