Mixing consolidation

This Consolidate the Mixin and it's related with #86