Support sub set of catalog version 2