Minor modifications to hook the RBAC code with what we currently had.