Removed sampleId field. Added dirty