Moved track management a pro feature
Support for different builds
Fixed null pointer issue