Waila support being added for blocks