Added dynamic permission enforcement