Added tracking_with_filter and trackers_with_filter to entity class