Update imports for new style