Added some simulation level data colection