Made the upstream be optional