TODO for possible enhancement of the API