Refactor to use Class.