Added adaptation for different hubPrefix