Aboish flags, Add type instead.
Merge.