Converted to a proper class.