Add initial upstream parsing