Re-implement changes for #118 with new types of measures