Rework traits