Feature/bootstrap integration