improvements for catalog usage