Refactor measure attributes to a POCO