MOD: upgrade data-role and func-role