Added the configuration management. Also some other improvements in the generation