Issue IKTREDEL-103 by cableman: Refactored the client plugin to be simpler