Better support for subclassing