Catalog tag and inheritance improvements

Implemented 'catalog' tag to allow defining objects that
don't get explicitly created. Extended inheritance to support
nesting.