Moved setter methods into tracker core