AFFINITY-6 Minor changes to further facilitate reuse