Add helper methods for catalog construction with validation