Worked on improved mixin support
Moved mixin handling to variable