Added auto-update option