APIs might do this in future?