Updated scripts and catalog files