Changes for smart execution