Performance improvements, new scenarios