ajustments for new api-version