Created and added some functionality to Client