Extern config file
Fixed up data management