Refactor traits merging