Updated for version 3.7.0.