Modifications to include everything into the Bootstrap service provider