Added limited execution support