Updated to include superclass