Updated to include a few other dependencies