[ORB-261] refactored the measurements system