Changed schema to fit multiple samples in an entity