Added new table measurement and fix scenarios