Refactoring + Changes of ConfigParser