[UPDATE] Fixed the mixin file  and modules