More updates in the branch structure