Updated TODO
Moving configuration parameters to its own structure