Traits handling improvements