Added "when" field