Refactoring for openagency 2.6 (branchName)