Adding support for some more field in the api