#8 updated  methods used and dao api based on server changes