Figure 1 & 4: Updated APM Framework