Update for new API listener