GPII-397: Updating values according to the latest changes

Now we are not being forced to use strings as value type