Fix imports to work with new api