Revise storing and retrieving destinations