Improved bootstrapping and services