Making Intercom thread safe