Refactoring Measurement Service to support using Generics with DTOs