Refactored Client and bumped version to 0.0.5