I'd add in even more traits. Perhaps even sub-traits?