Modified OOR import to support multiple branches