marked some classes as being experimental in 2.3