3.0.x merge better class calls with 3.0 improvements.