diff --git a/modelstore/__init__.py b/modelstore/__init__.py
index bd6c6d3f..87324397 100644
--- a/modelstore/__init__.py
+++ b/modelstore/__init__.py
@@ -11,12 +11,12 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-from pkg_resources import DistributionNotFound, get_distribution
+from importlib.metadata import version
 
 # pylint: disable=unused-import
 from modelstore.model_store import ModelStore
 
 try:
-    __version__ = get_distribution("modelstore").version
-except DistributionNotFound:
+    __version__ = version("modelstore")
+except PackageNotFoundError:
     __version__ = "unavailable"
diff --git a/modelstore/metadata/code/dependencies.py b/modelstore/metadata/code/dependencies.py
index bd2628d9..6f6cf7cc 100644
--- a/modelstore/metadata/code/dependencies.py
+++ b/modelstore/metadata/code/dependencies.py
@@ -14,7 +14,7 @@
 import importlib
 import sys
 
-import pkg_resources
+from importlib.metadata import version
 
 from modelstore.utils.log import logger
 
@@ -37,7 +37,7 @@ def _get_version(modname: str) -> str:
     except AttributeError:
         try:
             #  Annoy does not have a __version__
-            return pkg_resources.get_distribution(modname).version
+            return version(modname)
         except Exception:
             logger.debug("Unable to get %s's version", modname)
             return None
diff --git a/modelstore/models/model_manager.py b/modelstore/models/model_manager.py
index de6888a1..443e6124 100644
--- a/modelstore/models/model_manager.py
+++ b/modelstore/models/model_manager.py
@@ -225,7 +225,7 @@ def upload(
 
 def _format_numpy(model_params: dict) -> dict:
     for key, value in model_params.items():
-        if isinstance(value, (np.float_, np.float16, np.float32, np.float64)):
+        if isinstance(value, (np.float16, np.float32, np.float64, np.float96)):
             model_params[key] = float(value)
         if isinstance(value, np.ndarray):
             model_params[key] = value.tolist()