Fix namespace issues
Add Finisher for CosmoCode EMS