Added Creating call, slightly refactored Adding Client