Move ExtraInfo to own file