Added more scenario types

Added Resource-Role Scenarios and Resource Scenarios