Adding some missing dependencies
Keeping credit where due