Transitioned over to roles instead of includes

Roles are now used instead of includes.