Updating default values to zero instead of null