Added granular access control as well