Move the mixin to the top-level components