General
Added thread safety features