Adding support for 4.0 and 4.5