Added support for calculations with moles