[MD]: Updating Catalog API (and class depending on it) to support multiple FeatureTypes