[code] added more ich support