diff --git a/poetry.lock b/poetry.lock
index b2151501f8ef6d9d235753f50d99705302eb00cd..09c173add1b89619bc96a28a095497b0de2471da 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -790,14 +790,16 @@ scipy = "*"
 
 [[package]]
 name = "hop-client"
-version = "0.5.0"
+version = "0.5.1.dev42+gb9e31ed"
 description = "A pub-sub client library for Multi-messenger Astrophysics"
 category = "main"
 optional = false
 python-versions = ">=3.6.*"
+develop = false
 
 [package.dependencies]
 adc-streaming = ">=2.0.0"
+fastavro = ">=1.4.0"
 pluggy = ">=0.11"
 toml = ">=0.9.4"
 xmltodict = ">=0.9.0"
@@ -806,6 +808,12 @@ xmltodict = ">=0.9.0"
 dev = ["autopep8", "flake8", "pytest (>=5.0,<5.4)", "pytest-console-scripts", "pytest-cov", "pytest-runner", "twine"]
 docs = ["sphinx", "sphinx-rtd-theme", "sphinxcontrib-programoutput"]
 
+[package.source]
+type = "git"
+url = "https://github.com/scimma/hop-client.git"
+reference = "avro-support"
+resolved_reference = "b9e31ed39114fda5a820c4f905df4a36f8cca9cf"
+
 [[package]]
 name = "humanize"
 version = "4.0.0"
@@ -972,6 +980,14 @@ qtconsole = ["qtconsole"]
 test = ["pytest (<7.1)", "pytest-asyncio", "testpath"]
 test_extra = ["pytest (<7.1)", "pytest-asyncio", "testpath", "curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.19)", "pandas", "trio"]
 
+[[package]]
+name = "iso8601"
+version = "1.0.2"
+description = "Simple module to parse ISO 8601 dates"
+category = "main"
+optional = false
+python-versions = ">=3.6.2,<4.0"
+
 [[package]]
 name = "itsdangerous"
 version = "2.1.2"
@@ -1349,6 +1365,17 @@ category = "main"
 optional = false
 python-versions = ">=3.8"
 
+[[package]]
+name = "orderedmultidict"
+version = "1.0.1"
+description = "Ordered Multivalue Dictionary"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+six = ">=1.8.0"
+
 [[package]]
 name = "p-astro"
 version = "1.0.0"
@@ -2367,6 +2394,26 @@ category = "main"
 optional = false
 python-versions = ">=3.6"
 
+[[package]]
+name = "voevent-parse"
+version = "1.0.3"
+description = "Convenience routines for parsing and manipulation of VOEvent XML packets."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+astropy = ">=1.2"
+iso8601 = "*"
+lxml = ">=2.3"
+orderedmultidict = "*"
+pytz = "*"
+six = "*"
+
+[package.extras]
+all = ["pytest (>3)", "coverage"]
+test = ["pytest (>3)", "coverage"]
+
 [[package]]
 name = "voeventlib"
 version = "1.2"
@@ -2456,7 +2503,7 @@ test = ["pytest-celery", "pytest-flask", "pytest-socket"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.8"
-content-hash = "c35c1f29c330d9cfbed45a22a01407e3cc8184a482133a30b82d3f9d7d7b2606"
+content-hash = "5320c9f889366aaf066a863268f5c9f741d67f6ea4f8c61853a059db24ee8f7e"
 
 [metadata.files]
 adc-streaming = [
@@ -2860,10 +2907,7 @@ healpy = [
     {file = "healpy-1.15.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c8d7a279815446d12d6cc3e2c030d893dac785ac65f11314e2932638970c5f8"},
     {file = "healpy-1.15.2.tar.gz", hash = "sha256:d559ad287a78d3b500919a5cb9e4dff3cb63c1b3a2e23edf62819c871ccacf7f"},
 ]
-hop-client = [
-    {file = "hop-client-0.5.0.tar.gz", hash = "sha256:ea15cbfb972fc9ee208397234e6e5371df076bec1cdbacb35735b5c70731b14f"},
-    {file = "hop_client-0.5.0-py3-none-any.whl", hash = "sha256:2c355d43919b70e109b7e9bfe15646b083a156924a00b0f1e7b0e2733563f9ea"},
-]
+hop-client = []
 humanize = [
     {file = "humanize-4.0.0-py3-none-any.whl", hash = "sha256:8d86333b8557dacffd4dce1dbe09c81c189e2caf7bb17a970b2212f0f58f10f2"},
     {file = "humanize-4.0.0.tar.gz", hash = "sha256:ee1f872fdfc7d2ef4a28d4f80ddde9f96d36955b5d6b0dac4bdeb99502bddb00"},
@@ -2908,6 +2952,10 @@ ipython = [
     {file = "ipython-8.2.0-py3-none-any.whl", hash = "sha256:1b672bfd7a48d87ab203d9af8727a3b0174a4566b4091e9447c22fb63ea32857"},
     {file = "ipython-8.2.0.tar.gz", hash = "sha256:70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1"},
 ]
+iso8601 = [
+    {file = "iso8601-1.0.2-py3-none-any.whl", hash = "sha256:d7bc01b1c2a43b259570bb307f057abc578786ea734ba2b87b836c5efc5bd443"},
+    {file = "iso8601-1.0.2.tar.gz", hash = "sha256:27f503220e6845d9db954fb212b95b0362d8b7e6c1b2326a87061c3de93594b1"},
+]
 itsdangerous = [
     {file = "itsdangerous-2.1.2-py3-none-any.whl", hash = "sha256:2c2349112351b88699d8d4b6b075022c0808887cb7ad10069318a8b0bc88db44"},
     {file = "itsdangerous-2.1.2.tar.gz", hash = "sha256:5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a"},
@@ -3228,6 +3276,10 @@ numpy = [
     {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"},
     {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"},
 ]
+orderedmultidict = [
+    {file = "orderedmultidict-1.0.1-py2.py3-none-any.whl", hash = "sha256:43c839a17ee3cdd62234c47deca1a8508a3f2ca1d0678a3bf791c87cf84adbf3"},
+    {file = "orderedmultidict-1.0.1.tar.gz", hash = "sha256:04070bbb5e87291cc9bfa51df413677faf2141c73c61d2a5f7b26bea3cd882ad"},
+]
 p-astro = [
     {file = "p_astro-1.0.0.tar.gz", hash = "sha256:810bd5413ba1bce5153a2ab2616a94530dceaa34b14699aa794702a12ecdad04"},
 ]
@@ -3954,6 +4006,9 @@ vine = [
     {file = "vine-5.0.0-py2.py3-none-any.whl", hash = "sha256:4c9dceab6f76ed92105027c49c823800dd33cacce13bdedc5b914e3514b7fb30"},
     {file = "vine-5.0.0.tar.gz", hash = "sha256:7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340bd637e"},
 ]
+voevent-parse = [
+    {file = "voevent-parse-1.0.3.tar.gz", hash = "sha256:9c4f3479d6890ed9e6123aefa8e2f5dfacf711eec161bdcb3b90da70b519ba86"},
+]
 voeventlib = [
     {file = "VOEventLib-1.2-py3-none-any.whl", hash = "sha256:1d566284e250bf546d483d86d5bc34bafa73aa068a5413defcf5577128a5429d"},
     {file = "VOEventLib-1.2.tar.gz", hash = "sha256:494450715bfefc063ff552d3d259ed8434de1effa8b3ee66dc99fe887e8ff202"},
diff --git a/pyproject.toml b/pyproject.toml
index 9b5bdd63730fd7d4e1c455f3efef281ffeeb8563..2f1f5969220cac35a5a17a7e40b10866c56766ee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -92,8 +92,9 @@ sphinx = {version=">=4.0", optional=true}
 pytest-celery = {version="*", optional=true}
 pytest-flask = {version="*", optional=true}
 pytest-socket = {version="*", optional=true}
-hop-client = "^0.5.0"
 fastavro = "^1.4.10"
+hop-client = {git = "https://github.com/scimma/hop-client.git", branch="avro-support"}
+voevent-parse = "^1.0.3"
 
 [tool.poetry.extras]
 doc = ["pep517", "sphinx"]