Added support for updating flags