Added EventHandling to Catalog Manager