Update imports for new functions