Update to work with 1.7+ new versioning scheme