Fixed span hierarchy
Updated to provide branch info