- Replaced all references to old API with new API