Adding initial support for branch paths