Support for new API and Tracker