Added better dependencies and other stuff