Major upgrade on User Role