Added deleted flags, explicit default values for boolean comparison