Update Query for new Schema