Implemented TargetTracker interface, modified attributes-related classes