Parameterize the iso and fix a versioning bug