Added more auditing and delete/undelete functionality