Add new flags and remove old flags