Refactoring + Configuration handler