[IMP] fixes #275 - Code refactoring on configuration set