Change superclass to be nonintrusive