Refactoring options to config xml