Initialization improvement.