Added separation by board type