Implemented initial tracking service