Put more details in the doc based on conversation in the issue