OPAL-2594 Refactored to allow easier addition of permission commands