Added multi-catalg support