Improving API 1104 for the Twenty-second Edition - 2017