Added mixin support