Unit list improvement