General updates to work with TIBCO EMS