Updates to Workbook and Writer