Replace wrapper hack with simple inheritance