Add CalculatedAttribute (work in progress)
Add CalculatedAttribute