Added additional field, name fix