Added mRawTables check back in