Added basic client functionality