Refactor on configuration Model object