Update to use Class