Start supporting validation in catalog version2