Completed info
Moved global configuration into a singleton