Changes to support inheritance
Updated wrapper files
More changes to support inheritance