Update compatibility to 4.0