Added auto update option