Add special variables detection