#2 - re-factoring in Core/Model/RolePermission.