Restructure dao to Client + Parser