Added in new class to contain and modify traits.