Update geometry, integer, optional from develop.