Added nulls and default values to entities