Added framework for branching support