Improve Trait generification