Add APICall classes and combine issues into one detector