Added TrackerEntity and update query object.