Changes for RunScope