Add more automation to bootstrap