Fixed issue with ThreadSafe

Using a shim class for now until a pull request gets accepted
Thread safety + code standards