Added auto update feature