Move validation, add catalog-level params.