Added inheritance