Added BOTR support