Added capability to support custom roles