Added support for restart_policy parameter