Refactor Measure into a POCO