Refactoring to static roles See original record