Add blocks and bootstrap