Made catalog more robust by allowing multi-level storing and querying