Updating calculator engine based on new struture