Added classes for traits