CLSN-1921 check the implementation of how the attributes are added