Classes balance / rework