Updated for new APM