Move bundle methods into FlagsAPI