added role and goal metrics