[IM] Scripts update after review