Oops!
Refactored configuration initialisation