Updated to use the mixin.