Some minor changes in the imports and the dependencies