Reworked trait system