JZ: data, stats & exce tests + some refactoring
JZ: Fetch catalog via dedicated method instead