This commit improves new object generation