Adding support for custom roles