Adapted to changes of beam-common where field names have been modified.