Add more types to measure