Add tracking for beta & z