update fake data generator
updated storage schemas
merged