(PE-3021) Remove typesafe code, use external lib