Updated Bootstrapper