Updated mixin logic