added role support