Completed bootstrap implementation