Support for version 4.x

Keep supporting 4.0 and beyond.