Some tracking and API changes