Add support for 4.0