Added calculation properties
Working