Fixed references in definition files
Improved initializing process