Changes to support blocks properly