Modernize the traits layout