diff --git a/custom_components/browser_mod/media_player.py b/custom_components/browser_mod/media_player.py
index dbf7f4e..4d59f53 100644
--- a/custom_components/browser_mod/media_player.py
+++ b/custom_components/browser_mod/media_player.py
@@ -1,4 +1,5 @@
 import logging
+from homeassistant.components import media_source
 from homeassistant.components.media_player import (
     SUPPORT_PLAY,
     SUPPORT_PLAY_MEDIA,
@@ -8,6 +9,14 @@ from homeassistant.components.media_player import (
     SUPPORT_VOLUME_MUTE,
     MediaPlayerEntity,
 )
+from homeassistant.components.media_player.browse_media import (
+    async_process_play_media_url,
+)
+from homeassistant.components.media_player.const import (
+    MEDIA_TYPE_MUSIC,
+    MEDIA_TYPE_URL,
+    SUPPORT_BROWSE_MEDIA,
+)
 from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_PAUSED,
@@ -68,6 +77,7 @@ class BrowserModPlayer(MediaPlayerEntity, BrowserModEntity):
             | SUPPORT_STOP
             | SUPPORT_VOLUME_SET
             | SUPPORT_VOLUME_MUTE
+            | SUPPORT_BROWSE_MEDIA
         )
 
     @property
@@ -88,9 +98,23 @@ class BrowserModPlayer(MediaPlayerEntity, BrowserModEntity):
     def mute_volume(self, mute):
         self.connection.send("mute", mute=mute)
 
-    def play_media(self, media_type, media_id, **kwargs):
+    async def async_play_media(self, media_type, media_id, **kwargs):
+        if media_source.is_media_source_id(media_id):
+            media_type = MEDIA_TYPE_URL
+            play_item = await media_source.async_resolve_media(self.hass, media_id)
+            media_id = play_item.url
+        if media_type in (MEDIA_TYPE_URL, MEDIA_TYPE_MUSIC):
+            media_id = async_process_play_media_url(self.hass, media_id)
         self.connection.send("play", media_content_id=media_id)
 
+    async def async_browse_media(self, media_content_type=None, media_content_id=None):
+        """Implement the websocket media browsing helper."""
+        return await media_source.async_browse_media(
+            self.hass,
+            media_content_id,
+            content_filter=lambda item: item.media_content_type.startswith("audio/"),
+        )
+
     def media_play(self):
         self.connection.send("play")
 
diff --git a/hacs.json b/hacs.json
index 4dfc045..ea0cf93 100644
--- a/hacs.json
+++ b/hacs.json
@@ -1,4 +1,4 @@
 {
   "name": "browser_mod",
-  "homeassistant": "2021.5.0"
+  "homeassistant": "2022.3.0"
 }