Added more traits - somehow breaks unittests