Update for Flags v1.3