Merge pull request #396 from gloryming/master

updated catalog structures