[3.1.0] Preparation for autoload