Updated to reflect mixin