Add support for Branch and Dir