Updated to include missing dependencies