Update for version 4.0 and on + start working on trait.