PIM-3321: improved specs