More improvement on API proposal