SuperClass improvements