Reduced dependency to 3.7.0