First step at refactoring to distinguish between configuration and constants