Added Traits support