Added services and improved bootstrapping