Sorry, I forgot I've changed how the Configuration is structured after having merged this, there is no such thing anymore in the code.

Thanks anyway for reviewing it.