split self-tracking to new plugin