Updated $setup blocks