Added inheritence and mixins