Add basic monitoring, fix problem in _modify_updates