add beta feature conditional into code