Refactored to use Catalog in schema model.
Completes GitHub issue/enhancement #61.
Completes GitHub issue/enhancement #59.
Fixes GitHub issue/defect #57.