Make roles on blocks more semantic