Added more options for the api