Update.
Updates for 4.0.6 version.
Updated classes inner structure.
Prepared for 4.0.7 version.