Reduced code size by using defining block for measurements. #48