Make catalog more scalable