Add new measurements.

Add modular framework for measurements.