add basic calculated measure support