Better bootstrap implementation