Updated input structure