Added some platform code for private testing