Improve structure to have all configuration constants together