Added a bunch of new traits