Cleanup
Use correct flag
Support for auto-detecting destination path based on current prefix. Switched to getters for correctly supporting this.