Use data.catalogPath instead of hard-coded path