Added support for 4.2.x