Added option to force update