Improve performance of deleting entity types
Make posting of measurements more flexible