Added optional thread safety to Final