Make it work with other destinations than Notes/Data