Added code to normalize mData and mPdf