updated imports for cjs