This is one step closer toward 1.32.0, where the 2018 edition is stable. Mostly refactoring the imports and giving function parameters name in traits