Make beta features a toggleable user setting