added support and unit test for measures and tags.