Moved class attributes to tracking parameters