Since you added this in like 4 places I think maybe it should just be done in the StateToContent itself, if you pass it a Collection on construction