Changes to BuildWorld and BoardModel