Upgrade FieldSpring to include fixed addtopo