Adding logic to list by tag as well as branch