Some more changes for the Flags and Attributes API and behavior