Add support for XON_BRANCH selection