Adding auto-update feature