Add basic spying support