Corrected the imports for the latest dolmen packages