Rework with classes