Rewrite dependency management again