adding additional required fields needed for results. Also shuffling around bundle config