Refactoring, add configuration support