Reworked analysis methods and data structures