Removing code duplication with roles See original record