Added auto-update capability