Added basic client implementation