Small refactoring
Support destination