Unify role store