Added thread safe capabilites