Made sure collect-core calculated attribute values are not updated. Persisted calculated attributes.