Add support for delete, handle key that has no value