updated build and imports for modern software versions