[IMP] Add the charset and order imports