Updating for 1.7.0 version.