Now with more 4.1.0 support