Added support for sensitivity selection