Replace Namespaces with mixins