Add minor version compatibility for 5.x line