Added RestartPolicy handling