Refactoring + better configuration
Move more configuration to config file