Updating to be a mixin