INFR-27837 refactor and add params to API