Add docstring, deletion mechanism and extra reporting