Add 6.0.6 and 5.0.18