Added a few client methods and changes initialize