adding beta support