Dependency exclusion fixed + some configuration parameters fixed