Improved Mixin structure