added support for expunge_on_deleted_flag