Added graceful option to several resources