Moved generation of destination path