Updated with a few missing dependencies