Bootstrap debugging. Cleaned api interface