Updated for new API and deps