Tracking Improvements

Make configuration of tracking easier and improve the code base for easier extensions.