Added wait-for-green and creation and termination