Improve BoardBuilder