Updates to CalStruct class