with updated schema