Yep. Like I said, my changes are just a hack that works for me (I do not use multiple libraries). My python knowleged is also very limited. That's the reason I never tried to push a PR for a general case.
To be honest, I did this just for fun. I have no use for a catalog at all.
