Reworked board class