Less flags, more generic properties