Updated synopsis and handle comparator