Fixed execution state tracker and removed second level store