role table refactor