renamed Class to ClassNumber in DTOs