updated to new Schema