Synced with updated Export JSON