- Added a descriptor to control wanted measurement
- Changed some variables to private