Adjusted Board Model

Change-Id: I0118e506a1d4b9c6164b0d362ac9646a9ff593b3