Feature/check thread safe