Modified save behavior and providers