REF-53 - Role property re-factor

REF-53 - Role property re-factor