Adding Auto-update feature