Made catalog fetching optional