Updated parsing of board