Added object tracking