revised master catalog structure