Refactor of destination default values