Add support of the Options in the Calculator.