Completed XSSF support