Added further split out of roles

Added further split out of roles