Analysis

Reworking operation matching APIs