Updated dependencies and imports