Updates required by Guarato