Complete parameterization, fix version ordering issue