General: Refactored tracking
General: Bumped version to 0.5.6