Updated the interfaces to use the latest ICOM macros.