Updating default values to zero instead of null
Updating to ensure that required data is obtained when querying