Moved trait classes to Traits.h