Adding the new Flags feature