Use linked hash map for iterable hash map
Check for non-existing null entities
Allow removing watchers from just the entity ID