Adding necessary dependencies and removing deprecated ones