Feature/integrating with web client