Add COM support