Refactored Ooxml library to allow more flexibility