Add catalog integration support