Removed tracking_objects and added tracking field to ObjectEntry.
Aesthetic changes