Refactored storage of board