Enhance initialization #9