Increased stability and thread-safety