Various fixes & added Mixin support