This will be done with a dedicated api method