Added default value for self_delete