Removed the unnecessary amount of lists in the TraitHandler and fixed compile errors.