Will add this in 4.0.0 instead of 3.6.x