Feature/rework bootstrap (#886)