Added granular role policies