Added blocks and tooltips