Updated to use new shared bootstrap files