extras keys for Builder inputs

Change-Id: Ic9e48f09259a6fc4074f5d559e3511bd8cc807b4