Add always restart option