Update imports in order to override mixins