Added patch to core and removed bootstrap