Updated SETUP_BY_USER, added missing dependencies