More changes to Board Module