Adapted to new server model for branches