Minor changes to allow retrieve data from a particular Server