Updated client. Add plugin support