Adding support for measuring input