Add new data generator
Use new data generator
Pass more information in case of exception