Continued fixing #72. Using ContentStamp as the map key.