Beta7 compatibility