Upstream changed code structure