Api update and isScalar review