Basic bootstrap implementation added