Jf/traits improvements