WIP: new attribute/measure schema; broken