Fix traits
Move traits to traits_ex
Move a line to code