Updated to use new 0.9.1 API - Deps changed to Tracker