Made it possible to add data stuff to config
resolve conflict