Updated model to include sample_date and new name for user field