Fixed client and added more methods