Fixed bootstrap and added stubs