Initial catalog structure v2