Updated for new ALP API