Refactor out Role providers