Update to permission rules

EV-176