Add auto reload support