1.3.5 - Role store refactorings