Improved bootstrap script to be called anywhere
Slightly less code duplication