Add logic to speedup booting