@since for new pulblic api