6.0 beta support