Added revision handling