SAM #52: Converting Client to Mavenclient and adding Validation