Added basic client support