Adapted to changes related to execution variables.