Updated mixin