Moving ConventionsTrait to Core