Adding refactor change to BoardModel