[Osaide] Fixing thread saftey implementation