[enh] added COM mapping