add Client Wrapper
merge