Next version of automation scripts