Updated board form factory