Add support for calculations and conversions