Continued work on implementing new role annotations.