Added auto save delegating functionality