improved mixin support