Added inheritence